Patchwork [Karmic] SRU: acerhdrf: fix the remaining vendors too

login
register
mail settings
Submitter Stefan Bader
Date Oct. 9, 2009, 9:25 a.m.
Message ID <4ACF0181.7000801@canonical.com>
Download mbox | patch
Permalink /patch/35605/
State Accepted
Headers show

Comments

Stefan Bader - Oct. 9, 2009, 9:25 a.m.
Andy Whitcroft wrote:
>>> -MODULE_ALIAS("dmi:*:*Gateway*:*:");
>>> -MODULE_ALIAS("dmi:*:*Packard Bell*:*:");
>>> +MODULE_ALIAS("dmi:*:*Gateway*:*pnAOA:");
>>> +MODULE_ALIAS("dmi:*:*Packard Bell*:*pnAOA:");
>>> +MODULE_ALIAS("dmi:*:*Packard Bell*:*pnDOA:");
>> ... and these new one :*pnAOA: ... are they really different formats on
>> these two sets of laptops?
> 
> Turns out this is an error, and in fact the to be upstreamed patch is
> probabally a better way to go.  smb will send that patch out and we will
> revert the half we have already and apply that en-toto.
> 
> NAK
> 
> -apw

Sent upstream like this:

http://marc.info/?l=linux-acpi&m=125474458013677&w=2
Andy Whitcroft - Oct. 9, 2009, 10:41 a.m.
On Fri, Oct 09, 2009 at 11:25:21AM +0200, Stefan Bader wrote:
> From 60cdb7bea856fdd594262ee1e9608cd2210cf196 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader@canonical.com>
> Date: Mon, 28 Sep 2009 17:11:29 +0000
> Subject: [PATCH] acerhdf: Limit modalias matching to supported boards
> 
> BugLink: https://bugs.launchpad.net/ubuntu/+bug/435958
> 
> The module alias currently matches any Acer computer but when loaded the
> BIOS checks will only succeed on Aspire One models. This causes a invalid
> BIOS warning for all other models (seen on Aspire 4810T).
> This is not fatal but worries users that see this message. Limiting the
> moule alias to models starting with AOA or DOA for Packard Bell.
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> Acked-by: Borislav Petkov <petkovbb@gmail.com>
> Acked-by: Peter Feuerer <peter@piie.net>
> ---
>  drivers/platform/x86/acerhdf.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
> index 0a8f735..23eea4c 100644
> --- a/drivers/platform/x86/acerhdf.c
> +++ b/drivers/platform/x86/acerhdf.c
> @@ -629,9 +629,10 @@ static void __exit acerhdf_exit(void)
>  MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Peter Feuerer");
>  MODULE_DESCRIPTION("Aspire One temperature and fan driver");
> -MODULE_ALIAS("dmi:*:*Acer*:*:");
> -MODULE_ALIAS("dmi:*:*Gateway*:*:");
> -MODULE_ALIAS("dmi:*:*Packard Bell*:*:");
> +MODULE_ALIAS("dmi:*:*Acer*:pnAOA*:");
> +MODULE_ALIAS("dmi:*:*Gateway*:pnAOA*:");
> +MODULE_ALIAS("dmi:*:*Packard Bell*:pnAOA*:");
> +MODULE_ALIAS("dmi:*:*Packard Bell*:pnDOA*:");
>  
>  module_init(acerhdf_init);
>  module_exit(acerhdf_exit);

ACK and applied.

-apw

Patch

From 60cdb7bea856fdd594262ee1e9608cd2210cf196 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Mon, 28 Sep 2009 17:11:29 +0000
Subject: [PATCH] acerhdf: Limit modalias matching to supported boards

BugLink: https://bugs.launchpad.net/ubuntu/+bug/435958

The module alias currently matches any Acer computer but when loaded the
BIOS checks will only succeed on Aspire One models. This causes a invalid
BIOS warning for all other models (seen on Aspire 4810T).
This is not fatal but worries users that see this message. Limiting the
moule alias to models starting with AOA or DOA for Packard Bell.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Peter Feuerer <peter@piie.net>
---
 drivers/platform/x86/acerhdf.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 0a8f735..23eea4c 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -629,9 +629,10 @@  static void __exit acerhdf_exit(void)
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Peter Feuerer");
 MODULE_DESCRIPTION("Aspire One temperature and fan driver");
-MODULE_ALIAS("dmi:*:*Acer*:*:");
-MODULE_ALIAS("dmi:*:*Gateway*:*:");
-MODULE_ALIAS("dmi:*:*Packard Bell*:*:");
+MODULE_ALIAS("dmi:*:*Acer*:pnAOA*:");
+MODULE_ALIAS("dmi:*:*Gateway*:pnAOA*:");
+MODULE_ALIAS("dmi:*:*Packard Bell*:pnAOA*:");
+MODULE_ALIAS("dmi:*:*Packard Bell*:pnDOA*:");
 
 module_init(acerhdf_init);
 module_exit(acerhdf_exit);
-- 
1.5.4.3