aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-20 11:09:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-20 11:09:10 -0700
commit73894397e70e537fea5331bfea9e920ae2e6387c (patch)
tree69fa9e32509b870f587a303d9d08c4ad93906260
parentMerge tag 'drm-fixes-2018-07-20' of git://anongit.freedesktop.org/drm/drm (diff)
parentACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems (diff)
downloadlinux-dev-73894397e70e537fea5331bfea9e920ae2e6387c.tar.xz
linux-dev-73894397e70e537fea5331bfea9e920ae2e6387c.zip
Merge tag 'acpi-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Extend the recently added suspend-to-idle quirk for Thinkpad X1 Carbon 6th to other systems from that familiy which turned out to need it too (Robin Johnson)" * tag 'acpi-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems
-rw-r--r--drivers/acpi/ec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 442a9e24f439..917f77f4cb55 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"),
},
},
{ },