aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Limonciello <mario_limonciello@dell.com>2012-05-24 10:45:00 -0700
committerJohn Rigby <john.rigby@linaro.org>2012-06-25 15:04:12 -0600
commit4b278267bad7b400d09824d9aec7c8b0cc70bc65 (patch)
treecf0a10b0e140a64676f6fcd2d0aba443d187a4da
parentf92587caa305b169ebd062598a9c039d4520a67d (diff)
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 <mario_limonciello@dell.com> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r--drivers/platform/x86/dell-laptop.c15
1 files changed, 15 insertions, 0 deletions
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",