tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds 5e8639b7 1a2a7d3e

+3 -21
+1 -19
drivers/platform/x86/dell-laptop.c
··· 127 127 }, 128 128 }, 129 129 { 130 - .matches = { 131 - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 132 - DMI_MATCH(DMI_CHASSIS_TYPE, "30"), /*Tablet*/ 133 - }, 134 - }, 135 - { 136 - .matches = { 137 - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 138 - DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*Convertible*/ 139 - }, 140 - }, 141 - { 142 - .matches = { 143 - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 144 - DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/ 145 - }, 146 - }, 147 - { 148 130 .ident = "Dell Computer Corporation", 149 131 .matches = { 150 132 DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), ··· 1261 1279 struct calling_interface_buffer buffer; 1262 1280 int ret; 1263 1281 1264 - dell_fill_request(&buffer, 0, 0, 0, 0); 1282 + dell_fill_request(&buffer, 0x1, 0, 0, 0); 1265 1283 ret = dell_send_request(&buffer, 1266 1284 CLASS_KBD_BACKLIGHT, SELECT_KBD_BACKLIGHT); 1267 1285 if (ret)
+1 -1
drivers/platform/x86/ideapad-laptop.c
··· 113 113 /* 114 114 * ACPI Helpers 115 115 */ 116 - #define IDEAPAD_EC_TIMEOUT (100) /* in ms */ 116 + #define IDEAPAD_EC_TIMEOUT (200) /* in ms */ 117 117 118 118 static int read_method_int(acpi_handle handle, const char *method, int *val) 119 119 {
+1 -1
drivers/platform/x86/wmi.c
··· 933 933 goto probe_failure; 934 934 } 935 935 936 - buf = kmalloc(strlen(wdriver->driver.name) + 4, GFP_KERNEL); 936 + buf = kmalloc(strlen(wdriver->driver.name) + 5, GFP_KERNEL); 937 937 if (!buf) { 938 938 ret = -ENOMEM; 939 939 goto probe_string_failure;