From: Robin H. Johnson <robbat2@gentoo.org>
Date: Fri, 13 Jul 2018 20:50:47 +0000 (+0000)
Subject: ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems
X-Git-Tag: v4.18-rc6~23^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2c4d6baf1bc4f7729773ffcee9ba2a9781578633;p=users%2Fdwmw2%2Flinux.git

ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems

The ec_no_wakeup matcher added for Thinkpad X1 Carbon 6th gen systems
beyond matched only a single DMI model (20KGS3JF01), that didn't cover
my laptop (20KH002JUS). Change to match based on DMI product family to
cover all X1 6th gen systems.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 442a9e24f4397..917f77f4cb556 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2042,7 +2042,7 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = {
 		.ident = "Thinkpad X1 Carbon 6th",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "20KGS3JF01"),
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Thinkpad X1 Carbon 6th"),
 		},
 	},
 	{ },