From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 20 Jun 2022 09:25:43 +0000 (+0200)
Subject: ACPI: EC: Remove duplicate ThinkPad X1 Carbon 6th entry from DMI quirks
X-Git-Tag: v5.15.73~1668
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=730b9eb8fb88f5be177c2043c05ba7fc33c8c489;p=platform%2Fkernel%2Flinux-rpi.git

ACPI: EC: Remove duplicate ThinkPad X1 Carbon 6th entry from DMI quirks

[ Upstream commit 0dd6db359e5f206cbf1dd1fd40dd211588cd2725 ]

Somehow the "ThinkPad X1 Carbon 6th" entry ended up twice in the
struct dmi_system_id acpi_ec_no_wakeup[] array. Remove one of
the entries.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9b859ff..d41fa0f 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2168,13 +2168,6 @@ 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_FAMILY, "ThinkPad X1 Carbon 6th"),
-		},
-	},
-	{
 		.ident = "ThinkPad X1 Yoga 3rd",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),