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

login
register
mail settings
Submitter Kamal Mostafa
Date May 24, 2012, 5:45 p.m.
Message ID <1337881500.4142.27.camel@fourier>
Download mbox | patch
Permalink /patch/161171/
State New
Headers show

Comments

Kamal Mostafa - May 24, 2012, 5:45 p.m.
From: Mario Limonciello <mario_limonciello@dell.com>

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>
---
 drivers/platform/x86/dell-laptop.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)
Tim Gardner - May 24, 2012, 6:11 p.m.
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
Seth Forshee - May 24, 2012, 6:25 p.m.
On Thu, May 24, 2012 at 10:45:00AM -0700, Kamal Mostafa wrote:
> From: Mario Limonciello <mario_limonciello@dell.com>
> 
> 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>

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

Acked-by: Seth Forshee <seth.forshee@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..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
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Patch

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",