Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73894397 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 28c20cc7 2c4d6baf

drivers/acpi/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -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"),

		},

	},

	{ },