Patchwork [maverick-SRU] UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist

login
register
mail settings
Submitter Kamal Mostafa
Date Jan. 24, 2011, 8:54 p.m.
Message ID <1295902454.16789.72.camel@fourier>
Download mbox | patch
Permalink /patch/80239/
State Accepted
Delegated to: Stefan Bader
Headers show

Comments

Kamal Mostafa - Jan. 24, 2011, 8:54 p.m.
SRU Justification:

Impact: We need this patch to fix Wi-fi kill switch behavior on some
upcoming Dell systems.  I submitted the patch to stable on 2010-12-22,
where it is still pending review.

Fix: The following patch is taken from upstream and is included in >=
2.6.36.

Testcase: We have tested this patch internally (LP: #687526).

---
commit 3bf476afc46065bc8e24ef43653d7c440d44c934
Author: Rezwanul Kabir <Rezwanul_Kabir@dell.com>
Date:   Wed Jun 23 12:02:43 2010 -0500

    UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist
    
    This is to support Precision M4500 and others.
    
    Signed-off-by: Rezwanul Kabir <Rezwanul_Kabir@dell.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    (cherry picked from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb)
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Tim Gardner - Jan. 24, 2011, 9:10 p.m.
On 01/24/2011 01:54 PM, Kamal Mostafa wrote:
> SRU Justification:
>
> Impact: We need this patch to fix Wi-fi kill switch behavior on some
> upcoming Dell systems.  I submitted the patch to stable on 2010-12-22,
> where it is still pending review.
>
> Fix: The following patch is taken from upstream and is included in>=
> 2.6.36.
>
> Testcase: We have tested this patch internally (LP: #687526).
>
> ---
> commit 3bf476afc46065bc8e24ef43653d7c440d44c934
> Author: Rezwanul Kabir<Rezwanul_Kabir@dell.com>
> Date:   Wed Jun 23 12:02:43 2010 -0500
>
>      UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist
>
>      This is to support Precision M4500 and others.
>
>      Signed-off-by: Rezwanul Kabir<Rezwanul_Kabir@dell.com>
>      Signed-off-by: Matthew Garrett<mjg@redhat.com>
>      (cherry picked from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb)
>      Signed-off-by: Kamal Mostafa<kamal@canonical.com>
>
> diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
> index 6110601..0fb56e0 100644
> --- a/drivers/platform/x86/dell-laptop.c
> +++ b/drivers/platform/x86/dell-laptop.c
> @@ -83,6 +83,12 @@ static const struct dmi_system_id __initdata dell_device_table[] = {
>   		},
>   	},
>   	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/
> +		},
> +	},
> +	{
>   		.ident = "Dell Computer Corporation",
>   		.matches = {
>   			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -628,4 +634,5 @@ MODULE_AUTHOR("Matthew Garrett<mjg@redhat.com>");
>   MODULE_DESCRIPTION("Dell laptop driver");
>   MODULE_LICENSE("GPL");
>   MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*");
> +MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*");
>   MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");
>
>

Needs a BugLink in the commit message. Its also not a SAUCE patch since 
its a cherry-pick from Linus' repo.

Otherwise,

Acked-by: Tim Gardner <tim.gardner@canonical.com>

rtg
Tim Gardner - Jan. 25, 2011, 2:50 p.m.
On 01/24/2011 01:54 PM, Kamal Mostafa wrote:
> SRU Justification:
>
> Impact: We need this patch to fix Wi-fi kill switch behavior on some
> upcoming Dell systems.  I submitted the patch to stable on 2010-12-22,
> where it is still pending review.
>
> Fix: The following patch is taken from upstream and is included in>=
> 2.6.36.
>
> Testcase: We have tested this patch internally (LP: #687526).
>
> ---
> commit 3bf476afc46065bc8e24ef43653d7c440d44c934
> Author: Rezwanul Kabir<Rezwanul_Kabir@dell.com>
> Date:   Wed Jun 23 12:02:43 2010 -0500
>
>      UBUNTU: SAUCE: dell-laptop: Add another Dell laptop family to the DMI whitelist
>
>      This is to support Precision M4500 and others.
>
>      Signed-off-by: Rezwanul Kabir<Rezwanul_Kabir@dell.com>
>      Signed-off-by: Matthew Garrett<mjg@redhat.com>
>      (cherry picked from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb)
>      Signed-off-by: Kamal Mostafa<kamal@canonical.com>
>
> diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
> index 6110601..0fb56e0 100644
> --- a/drivers/platform/x86/dell-laptop.c
> +++ b/drivers/platform/x86/dell-laptop.c
> @@ -83,6 +83,12 @@ static const struct dmi_system_id __initdata dell_device_table[] = {
>   		},
>   	},
>   	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/
> +		},
> +	},
> +	{
>   		.ident = "Dell Computer Corporation",
>   		.matches = {
>   			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
> @@ -628,4 +634,5 @@ MODULE_AUTHOR("Matthew Garrett<mjg@redhat.com>");
>   MODULE_DESCRIPTION("Dell laptop driver");
>   MODULE_LICENSE("GPL");
>   MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*");
> +MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*");
>   MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");
>
>

applied and pushed

Patch

diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 6110601..0fb56e0 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -83,6 +83,12 @@  static const struct dmi_system_id __initdata dell_device_table[] = {
 		},
 	},
 	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/
+		},
+	},
+	{
 		.ident = "Dell Computer Corporation",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
@@ -628,4 +634,5 @@  MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
 MODULE_DESCRIPTION("Dell laptop driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*");
+MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*");
 MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");