Commit 22e6630e authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent 9d845447

drivers/firmware/efi/libstub/x86-stub.c

+4 −4
Original line number Diff line number Diff line
@@ -580,11 +580,8 @@ setup_e820(struct boot_params *params, struct setup_data *e820ext, u32 e820ext_s 
			break;



		case EFI_UNACCEPTED_MEMORY:

			if (!IS_ENABLED(CONFIG_UNACCEPTED_MEMORY)) {

				efi_warn_once(

"The system has unaccepted memory,  but kernel does not support it\nConsider enabling CONFIG_UNACCEPTED_MEMORY\n");

			if (!IS_ENABLED(CONFIG_UNACCEPTED_MEMORY))

				continue;

			}

			e820_type = E820_TYPE_RAM;

			process_unaccepted_memory(d->phys_addr,

						  d->phys_addr + PAGE_SIZE * d->num_pages);
@@ -800,6 +797,7 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry) 


	status = efi_random_alloc(alloc_size, CONFIG_PHYSICAL_ALIGN, &addr,

				  seed[0], EFI_LOADER_CODE,

				  LOAD_PHYSICAL_ADDR,

				  EFI_X86_KERNEL_ALLOC_LIMIT);

	if (status != EFI_SUCCESS)

		return status;
@@ -839,6 +837,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle, 
	unsigned long kernel_entry;

	efi_status_t status;



	boot_params_pointer = boot_params;



	efi_system_table = sys_table_arg;

	/* Check if we were booted by the EFI firmware */

	if (efi_system_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)

drivers/hid/wacom_sys.c

+2 −15
Original line number Diff line number Diff line
@@ -2120,7 +2120,7 @@ static int wacom_setup_inputs(struct wacom *wacom) 
	return 0;

}



static int wacom_setup_inputs(struct wacom *wacom)

static int wacom_register_inputs(struct wacom *wacom)

{

	struct input_dev *pen_input_dev, *touch_input_dev, *pad_input_dev;

	struct wacom_wac *wacom_wac = &(wacom->wacom_wac);
@@ -2409,20 +2409,6 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) 
		goto fail;

	}



	error = wacom_setup_inputs(wacom);

	if (error)

		goto fail;



	if (features->type == HID_GENERIC)

		connect_mask |= HID_CONNECT_DRIVER;



	/* Regular HID work starts now */

	error = hid_hw_start(hdev, connect_mask);

	if (error) {

		hid_err(hdev, "hw start failed\n");

		goto fail;

	}



	error = wacom_register_inputs(wacom);

	if (error)

		goto fail;
@@ -2932,3 +2918,4 @@ MODULE_VERSION(DRIVER_VERSION); 
MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+13 −0
Original line number Diff line number Diff line
@@ -919,6 +919,19 @@ void aq_ring_free(struct aq_ring_s *self) 
	}

}



void aq_ring_hwts_rx_free(struct aq_ring_s *self)

{

	if (!self)

		return;



	if (self->dx_ring) {

		dma_free_coherent(aq_nic_get_dev(self->aq_nic),

				  self->size * self->dx_size + AQ_CFG_RXDS_DEF,

				  self->dx_ring, self->dx_ring_pa);

		self->dx_ring = NULL;

	}

}



unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data)

{

	unsigned int count;

drivers/net/ethernet/aquantia/atlantic/aq_ring.h

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ int aq_ring_rx_fill(struct aq_ring_s *self); 
int aq_ring_hwts_rx_alloc(struct aq_ring_s *self,

			  struct aq_nic_s *aq_nic, unsigned int idx,

			  unsigned int size, unsigned int dx_size);

void aq_ring_hwts_rx_free(struct aq_ring_s *self);

void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic);



unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data);

fs/smb/client/smb2pdu.c

+0 −12
Original line number Diff line number Diff line
@@ -5181,18 +5181,6 @@ smb2_parse_query_directory(struct cifs_tcon *tcon, 
	case SMB_FIND_FILE_FULL_DIRECTORY_INFO:

		info_buf_size = sizeof(FILE_FULL_DIRECTORY_INFO);

		break;

	case SMB_FIND_FILE_FULL_DIRECTORY_INFO:

		req->FileInformationClass = FILE_FULL_DIRECTORY_INFORMATION;

		break;

	case SMB_FIND_FILE_FULL_DIRECTORY_INFO:

		info_buf_size = sizeof(FILE_FULL_DIRECTORY_INFO);

		break;

	case SMB_FIND_FILE_FULL_DIRECTORY_INFO:

		info_buf_size = sizeof(FILE_FULL_DIRECTORY_INFO);

		break;

	case SMB_FIND_FILE_FULL_DIRECTORY_INFO:

		info_buf_size = sizeof(FILE_FULL_DIRECTORY_INFO);

		break;

	default:

		cifs_tcon_dbg(VFS, "info level %u isn't supported\n",

			 srch_inf->info_level);