2006-08-19 12:28:13

by Thomas Meyer

Subject: [PATCH] x86: Fix dmi detection of MacBookPro and iMac

This commit:
http://kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.git;a=commit;h=b64ef8afa58f397e1eaba2bd9ecaa6812064d464
contained a wrong DMI_MATCH.

Signed-off-by: Thomas Meyer <[email protected]>
---

The error can also be found in this broken out patch:
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc4/2.6.18-rc4-mm1/broken-out/add-force-of-use-mmconfig.patch
Please change DMI_BIOS_VERSION into DMI_PRODUCT_NAME

With kind regards
Thomas

diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
index b485bec..a6a0ffd 100644
--- a/drivers/video/imacfb.c
+++ b/drivers/video/imacfb.c
@@ -71,10 +71,10 @@ static int set_system(struct dmi_system_
static struct dmi_system_id __initdata dmi_system_table[] = {
{ set_system, "iMac4,1", {
DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_BIOS_VERSION,"iMac4,1") }, (void*)M_I17},
+ DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},
{ set_system, "MacBookPro1,1", {
DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
- DMI_MATCH(DMI_BIOS_VERSION,"MacBookPro1,1") }, (void*)M_I17},
+ DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},
{ set_system, "MacBook1,1", {
DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},

2006-08-19 15:42:26

by Edgar Hucek

Subject: Re: [PATCH] x86: Fix dmi detection of MacBookPro and iMac

Ups. You are right.

Signed-off-by: Edgar Hucek <[email protected]>

Thomas Meyer schrieb:
> This commit:
> http://kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.git;a=commit;h=b64ef8afa58f397e1eaba2bd9ecaa6812064d464
> contained a wrong DMI_MATCH.
>
> Signed-off-by: Thomas Meyer <[email protected]>
> ---
>
> The error can also be found in this broken out patch:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc4/2.6.18-rc4-mm1/broken-out/add-force-of-use-mmconfig.patch
>
> Please change DMI_BIOS_VERSION into DMI_PRODUCT_NAME
>
> With kind regards
> Thomas
>
> diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
> index b485bec..a6a0ffd 100644
> --- a/drivers/video/imacfb.c
> +++ b/drivers/video/imacfb.c
> @@ -71,10 +71,10 @@ static int set_system(struct dmi_system_
> static struct dmi_system_id __initdata dmi_system_table[] = {
> { set_system, "iMac4,1", {
> DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
> - DMI_MATCH(DMI_BIOS_VERSION,"iMac4,1") }, (void*)M_I17},
> + DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},
> { set_system, "MacBookPro1,1", {
> DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
> - DMI_MATCH(DMI_BIOS_VERSION,"MacBookPro1,1") }, (void*)M_I17},
> + DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},
> { set_system, "MacBook1,1", {
> DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
> DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>