ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems
authorRobin H. Johnson <robbat2@gentoo.org>
Fri, 13 Jul 2018 20:50:47 +0000 (20:50 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Aug 2018 11:09:20 +0000 (13:09 +0200)
[ 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>
drivers/acpi/ec.c

index 355add64681b24a9b0a84e5f46a0e8cd6612804f..3d624c72c6c2acb96fd175a617312c366568dea7 100644 (file)
@@ -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"),
                },
        },
        { },