]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ACPI: EC: Remove duplicate ThinkPad X1 Carbon 6th entry from DMI quirks
authorHans de Goede <hdegoede@redhat.com>
Mon, 20 Jun 2022 09:25:43 +0000 (11:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Aug 2022 13:15:30 +0000 (15:15 +0200)
[ 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>
drivers/acpi/ec.c

index 3f2e5ea9ab6b7a62b99c225c68cf1b9ae9458b79..7305cfc8e146a596fe5d2fbafc16088e5f22e9e2 100644 (file)
@@ -2180,13 +2180,6 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = {
                        DMI_MATCH(DMI_PRODUCT_FAMILY, "Thinkpad X1 Carbon 6th"),
                },
        },
-       {
-               .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 = {