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

login
register
mail settings
Submitter Stefan Bader
Date Oct. 9, 2009, 8:45 a.m.
Message ID <4ACEF812.30405@canonical.com>
Download mbox | patch
Permalink /patch/35598/
State Rejected
Headers show

Comments

Stefan Bader - Oct. 9, 2009, 8:45 a.m.
SRU justification:

Impact: With the first patch I was a bit to careful about changing only things 
I could test. But there are two other vendors that can be affected.

Fix: While discussing this upstream we agreed that the following changes should 
be straight forward and the logical extend of what I did. So the upstream patch 
is the combination of my first one and this.

Testcase: The reporter to the other bug still sees the message as he owns a 
Gateway laptop. Should vanish after this patch.
Andy Whitcroft - Oct. 9, 2009, 8:51 a.m.
On Fri, Oct 09, 2009 at 10:45:06AM +0200, Stefan Bader wrote:
> SRU justification:
> 
> Impact: With the first patch I was a bit to careful about changing
> only things I could test. But there are two other vendors that can
> be affected.
> 
> Fix: While discussing this upstream we agreed that the following
> changes should be straight forward and the logical extend of what I
> did. So the upstream patch is the combination of my first one and
> this.
> 
> Testcase: The reporter to the other bug still sees the message as he
> owns a Gateway laptop. Should vanish after this patch.
> 
> -- 
> 
> When all other means of communication fail, try words!
> 
> 

> From fc1f1120d9362e4a17b6aa100349bc262cb29ab1 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader@canonical.com>
> Date: Fri, 9 Oct 2009 10:15:33 +0200
> Subject: [PATCH] UBUNTU: SAUCE: acerhdf: Also limit the modaliases for the other vendors
> 
> This is a follow up to 78fd8d3eaed0ce239b5b607bcd8c7fb7e0a90bd4. The combined
> change was agreed upon when discussing with upstream.
> 
> BugLink: https://launchpad.net/bugs/446111
> 
> When changing the modaliases it makes sense to change the other elements
> for Gateway and Packard-Bell as well.
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  drivers/platform/x86/acerhdf.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
> index 763f233..59a5997 100644
> --- a/drivers/platform/x86/acerhdf.c
> +++ b/drivers/platform/x86/acerhdf.c
> @@ -630,8 +630,9 @@ MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Peter Feuerer");
>  MODULE_DESCRIPTION("Aspire One temperature and fan driver");
>  MODULE_ALIAS("dmi:*:*Acer*:pnAOA*:");

Why is this one :pnAOA*: ...

> -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?

-apw
Andy Whitcroft - Oct. 9, 2009, 9:05 a.m.
> > -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

Patch

From fc1f1120d9362e4a17b6aa100349bc262cb29ab1 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Fri, 9 Oct 2009 10:15:33 +0200
Subject: [PATCH] UBUNTU: SAUCE: acerhdf: Also limit the modaliases for the other vendors

This is a follow up to 78fd8d3eaed0ce239b5b607bcd8c7fb7e0a90bd4. The combined
change was agreed upon when discussing with upstream.

BugLink: https://launchpad.net/bugs/446111

When changing the modaliases it makes sense to change the other elements
for Gateway and Packard-Bell as well.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 drivers/platform/x86/acerhdf.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 763f233..59a5997 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -630,8 +630,9 @@  MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Peter Feuerer");
 MODULE_DESCRIPTION("Aspire One temperature and fan driver");
 MODULE_ALIAS("dmi:*:*Acer*:pnAOA*:");
-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:");
 
 module_init(acerhdf_init);
 module_exit(acerhdf_exit);
-- 
1.5.4.3