From f7cc4e384ee3230195ce280841dcb97eb9ae7567 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Thu, 24 May 2012 10:45:00 -0700 Subject: UBUNTU: SAUCE: dell-laptop: rfkill blacklist Dell XPS 13z, 15 BugLink: https://bugs.launchpad.net/bugs/901410 On Dell XPS 13z (L321X) and 15 (L502X), switching off Bluetooth also disables wifi. Fix by adding those models to the dell_blacklist table. Signed-off-by: Mario Limonciello Signed-off-by: Kamal Mostafa Signed-off-by: Tim Gardner --- drivers/platform/x86/dell-laptop.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index e6c08ee8d46..35b38cc2656 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -120,6 +120,21 @@ static const struct dmi_system_id __initdata dell_device_table[] = { MODULE_DEVICE_TABLE(dmi, dell_device_table); static struct dmi_system_id __devinitdata dell_blacklist[] = { + /* dell_laptop breaks rfkill behavior (LP: #901410) */ + { + .ident = "Dell XPS 13z", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L321X"), + }, + }, + { + .ident = "Dell XPS 15", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L502X"), + }, + }, /* Supported by compal-laptop */ { .ident = "Dell Mini 9", -- cgit v1.2.3