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-Url: https://git.stricted.de/?a=commitdiff_plain;h=119970f4775ba44e46545df5c3237ee8721dc1de;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

[ Upstream commit 2c4d6baf1bc4f7729773ffcee9ba2a9781578633 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 355add64681b..3d624c72c6c2 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2034,7 +2034,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"),
 		},
 	},
 	{ },