| Message ID | 1337881173-21228-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
Ooops, this is the wrong version of this patch, please disregard. -Kamal On Thu, 2012-05-24 at 10:39 -0700, Kamal Mostafa wrote: > From: Mario Limonciello <mario_limonciello@dell.com> > > BugLink: https://bugs.launchpad.net/bugs/901410 > > On Dell XPS 13z (L321X) and 15z (L502X), switching off Bluetooth also > disables wifi due to improper improper BIOS interaction with dell-laptop. > Add those models to the rfkill blacklist. > > Signed-off-by: Mario Limonciello <mario_limonciello@dell.com> > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > 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 e6c08ee..8223b6c 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 15z", > + .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", > -- > 1.7.9.5 > >
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index e6c08ee..8223b6c 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 15z", + .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",