diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2009-12-22 02:42:52 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-22 02:45:30 -0500 |
| commit | 55b313f249e11b815fd0be51869f166aaf368f44 (patch) | |
| tree | dd0d734bb3e0794df96e91c151350d52ba9ed08e /drivers/acpi/ec.c | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| download | kernel-common-55b313f249e11b815fd0be51869f166aaf368f44.tar.gz kernel-common-55b313f249e11b815fd0be51869f166aaf368f44.tar.bz2 kernel-common-55b313f249e11b815fd0be51869f166aaf368f44.zip | |
ACPI: EC: Fix MSI DMI detection
MSI strings should be ORed, not ANDed.
Reference: http://bugzilla.kernel.org/show_bug.cgi?id=14446
cc: stable@kernel.org
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index baef28c1e630..7511029a1e0b 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -916,6 +916,7 @@ static int ec_validate_ecdt(const struct dmi_system_id *id) /* MSI EC needs special treatment, enable it */ static int ec_flag_msi(const struct dmi_system_id *id) { + printk(KERN_DEBUG PREFIX "Detected MSI hardware, enabling workarounds.\n"); EC_FLAGS_MSI = 1; EC_FLAGS_VALIDATE_ECDT = 1; return 0; @@ -928,8 +929,13 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "JFL92") }, NULL}, { ec_flag_msi, "MSI hardware", { - DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star"), - DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star") }, NULL}, + DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star")}, NULL}, + { + ec_flag_msi, "MSI hardware", { + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star")}, NULL}, + { + ec_flag_msi, "MSI hardware", { + DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL}, { ec_validate_ecdt, "ASUS hardware", { DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, |