diff options
author | Peter Collingbourne <peter@pcc.me.uk> | 2011-04-24 17:09:32 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-04-25 16:54:15 -0400 |
commit | af986d101d141f10231ffa7e40ae397dc7356857 (patch) | |
tree | 8ba5dfc9684be60e8c89baf0940c2001ce58f571 | |
parent | 5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4 (diff) |
ACPI: EC: add another DMI check for ASUS hardware
Commit 0adf3c746a73684b3f8c2821a584e1db998f61e9 introduced a regression
by making the ECDT validation test for ASUS hardware more restrictive.
The previous test used the dmi_name_in_vendors function which searches
a number of DMI fields, while the new test checked only the BIOS
vendor, which is known to not match on an ASUS F5GL laptop which
requires ECDT validation.
Add a rule to ec_dmi_table based on an alternative DMI pattern for
ASUS hardware as found elsewhere in the kernel.
Signed-off-by: Peter Collingbourne <peter@pcc.me.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/ec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index fa848c4116a8..30ca71791bf2 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -940,6 +940,9 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { | |||
940 | { | 940 | { |
941 | ec_validate_ecdt, "ASUS hardware", { | 941 | ec_validate_ecdt, "ASUS hardware", { |
942 | DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, | 942 | DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, |
943 | { | ||
944 | ec_validate_ecdt, "ASUS hardware", { | ||
945 | DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc.") }, NULL}, | ||
943 | {}, | 946 | {}, |
944 | }; | 947 | }; |
945 | 948 | ||