[PATCH v2] UBUNTU: SAUCE: dell-laptop: rfkill blacklist Dell XPS 13z, 15

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH v2] UBUNTU: SAUCE: dell-laptop: rfkill blacklist Dell XPS 13z, 15

Kamal Mostafa-2
From: Mario Limonciello <[hidden email]>

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 <[hidden email]>
Signed-off-by: Kamal Mostafa <[hidden email]>
---
 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..35b38cc 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",
--
1.7.9.5




--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH v2] UBUNTU: SAUCE: dell-laptop: rfkill blacklist Dell XPS 13z, 15

Tim Gardner-2
As discussed with Kamal on IRC, I think we can carry this as a SAUCE
patch until it conflicts. The maintainer (Matthew Garrett) has rejected
this patch because he intends to rework the rfkill subsystem.

Applied to Quantal.

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Ack: [PATCH v2] UBUNTU: SAUCE: dell-laptop: rfkill blacklist Dell XPS 13z, 15

Seth Forshee
In reply to this post by Kamal Mostafa-2
On Thu, May 24, 2012 at 10:45:00AM -0700, Kamal Mostafa wrote:
> From: Mario Limonciello <[hidden email]>
>
> 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 <[hidden email]>
> Signed-off-by: Kamal Mostafa <[hidden email]>

Taking into account Tim's comments, I agree that we can carry this as a
sauce patch.

Acked-by: Seth Forshee <[hidden email]>

> ---
>  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..35b38cc 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",
> --
> 1.7.9.5
>
>
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team