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

Stefan Bader stefan.bader at canonical.com
Tue Jan 25 10:54:05 UTC 2011


On 01/25/2011 12:41 AM, Kamal Mostafa wrote:
> (Resubmit with rtg's corrections and Ack)
> 
> 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 f5d19c5d6db2226f5561292b06d42d74ea64bfff
> Author: Rezwanul Kabir <Rezwanul_Kabir at dell.com>
> Date:   Wed Jun 23 12:02:43 2010 -0500
> 
>     UBUNTU: dell-laptop: Add another Dell laptop family to the DMI whitelist

Hm, probably annoying nitpick but would we not completely take away the UBUNTU
tag as well as it really is a cherry-pick from upstream?
Otherwise buglink and rest looks good.

>     
>     This is to support Precision M4500 and others.
>     
>     BugLink: http://bugs.launchpad.net/bugs/693078
>     
>     Signed-off-by: Rezwanul Kabir <Rezwanul_Kabir at dell.com>
>     Signed-off-by: Matthew Garrett <mjg at redhat.com>
>     (cherry picked from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb)
>     Signed-off-by: Kamal Mostafa <kamal at canonical.com>
>     Acked-by: Tim Gardner <tim.gardner at canonical.com>
Acked-by: Stefan Bader <stefan.bader at 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 at 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:*");
> 
> 





More information about the kernel-team mailing list