aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Lin <yidi.lin@canonical.com>2014-09-14 23:56:12 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-24 17:22:05 -0400
commit8ee4104a681a3a30a495265825d8ebfe87d57d28 (patch)
tree663bd59cbbbd8dce329cf7e648710df6e8602df8
parent0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff)
ACPI / blacklist: add Win8 OSI quirks for some Dell laptop models
The wireless hotkey of those machines does not work with Win8 OSI. Due to insufficient documentation for the driver implementation, blacklist those machines as a workaround. "audo wake on after shutdown" bug on Dell Inspiron 7737 is fixed by BIOS. But this machine still suffers the hotkey issue. So keep the quirk for the wireless hotkey issue. Link: http://www.dell.com/support/home/us/en/19/Drivers/DriversDetails?driverId=MJWNX Signed-off-by: Edward Lin <yidi.lin@canonical.com> [ rjw: Subject ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/blacklist.c36
1 files changed, 34 insertions, 2 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 36eb42e3b0bb..ed122e17636e 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -247,8 +247,8 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
247 }, 247 },
248 248
249 /* 249 /*
250 * These machines will power on immediately after shutdown when 250 * The wireless hotkey does not work on those machines when
251 * reporting the Windows 2012 OSI. 251 * returning true for _OSI("Windows 2012")
252 */ 252 */
253 { 253 {
254 .callback = dmi_disable_osi_win8, 254 .callback = dmi_disable_osi_win8,
@@ -258,6 +258,38 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
258 DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7737"), 258 DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7737"),
259 }, 259 },
260 }, 260 },
261 {
262 .callback = dmi_disable_osi_win8,
263 .ident = "Dell Inspiron 7537",
264 .matches = {
265 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
266 DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7537"),
267 },
268 },
269 {
270 .callback = dmi_disable_osi_win8,
271 .ident = "Dell Inspiron 5437",
272 .matches = {
273 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
274 DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5437"),
275 },
276 },
277 {
278 .callback = dmi_disable_osi_win8,
279 .ident = "Dell Inspiron 3437",
280 .matches = {
281 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
282 DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 3437"),
283 },
284 },
285 {
286 .callback = dmi_disable_osi_win8,
287 .ident = "Dell Vostro 3446",
288 .matches = {
289 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
290 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3446"),
291 },
292 },
261 293
262 /* 294 /*
263 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug. 295 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.