diff options
-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 baef28c1e63..7511029a1e0 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) | |||
916 | /* MSI EC needs special treatment, enable it */ | 916 | /* MSI EC needs special treatment, enable it */ |
917 | static int ec_flag_msi(const struct dmi_system_id *id) | 917 | static int ec_flag_msi(const struct dmi_system_id *id) |
918 | { | 918 | { |
919 | printk(KERN_DEBUG PREFIX "Detected MSI hardware, enabling workarounds.\n"); | ||
919 | EC_FLAGS_MSI = 1; | 920 | EC_FLAGS_MSI = 1; |
920 | EC_FLAGS_VALIDATE_ECDT = 1; | 921 | EC_FLAGS_VALIDATE_ECDT = 1; |
921 | return 0; | 922 | return 0; |
@@ -928,8 +929,13 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { | |||
928 | DMI_MATCH(DMI_BOARD_NAME, "JFL92") }, NULL}, | 929 | DMI_MATCH(DMI_BOARD_NAME, "JFL92") }, NULL}, |
929 | { | 930 | { |
930 | ec_flag_msi, "MSI hardware", { | 931 | ec_flag_msi, "MSI hardware", { |
931 | DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star"), | 932 | DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star")}, NULL}, |
932 | DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star") }, NULL}, | 933 | { |
934 | ec_flag_msi, "MSI hardware", { | ||
935 | DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star")}, NULL}, | ||
936 | { | ||
937 | ec_flag_msi, "MSI hardware", { | ||
938 | DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL}, | ||
933 | { | 939 | { |
934 | ec_validate_ecdt, "ASUS hardware", { | 940 | ec_validate_ecdt, "ASUS hardware", { |
935 | DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, | 941 | DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, |