Commit 55b313f2 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

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: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 22763c5c

drivers/acpi/ec.c

+8 −2
Original line number Diff line number Diff line
@@ -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,7 +929,12 @@ 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_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", {