Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e8639b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.16-4' of git://git.infradead.org/linux-platform-drivers-x86 

Pull x86 platform driver fixes from Andy Shevchenko:

 - regression fix in keyboard support for Dell laptops

 - prevent out-of-boundary write in WMI bus driver

 - increase timeout to read functional key status on Lenovo laptops

* tag 'platform-drivers-x86-v4.16-4' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: dell-laptop: Removed duplicates in DMI whitelist
  platform/x86: dell-laptop: fix kbd_get_state's request value
  platform/x86: ideapad-laptop: Increase timeout to wait for EC answer
  platform/x86: wmi: fix off-by-one write in wmi_dev_probe()
parents 1a2a7d3e c8ba9db2

drivers/platform/x86/dell-laptop.c

+1 −19
Original line number Diff line number Diff line
@@ -126,24 +126,6 @@ static const struct dmi_system_id dell_device_table[] __initconst = { 
			DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_CHASSIS_TYPE, "30"), /*Tablet*/

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*Convertible*/

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/

		},

	},

	{

		.ident = "Dell Computer Corporation",

		.matches = {
@@ -1279,7 +1261,7 @@ static int kbd_get_state(struct kbd_state *state) 
	struct calling_interface_buffer buffer;

	int ret;



	dell_fill_request(&buffer, 0, 0, 0, 0);

	dell_fill_request(&buffer, 0x1, 0, 0, 0);

	ret = dell_send_request(&buffer,

				CLASS_KBD_BACKLIGHT, SELECT_KBD_BACKLIGHT);

	if (ret)

drivers/platform/x86/ideapad-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ MODULE_PARM_DESC(no_bt_rfkill, "No rfkill for bluetooth."); 
/*

 * ACPI Helpers

 */

#define IDEAPAD_EC_TIMEOUT (100) /* in ms */

#define IDEAPAD_EC_TIMEOUT (200) /* in ms */



static int read_method_int(acpi_handle handle, const char *method, int *val)

{

drivers/platform/x86/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ static int wmi_dev_probe(struct device *dev) 
			goto probe_failure;

		}



		buf = kmalloc(strlen(wdriver->driver.name) + 4, GFP_KERNEL);

		buf = kmalloc(strlen(wdriver->driver.name) + 5, GFP_KERNEL);

		if (!buf) {

			ret = -ENOMEM;

			goto probe_string_failure;