From: Hans de Goede <hdegoede@xxxxxxxxxx>
commit 65bdebf38e5fac7c56a9e05d3479a707e6dc783c upstream.
Commit d2aaf1996504 ("ACPI: resource: Add DMI quirks for ASUS Vivobook
E1504GA and E1504GAB") does exactly what the subject says, adding DMI
matches for both the E1504GA and E1504GAB.
But DMI_MATCH() does a substring match, so checking for E1504GA will also
match E1504GAB.
Drop the unnecessary E1504GAB entry since that is covered already by
the E1504GA entry.
Fixes: d2aaf1996504 ("ACPI: resource: Add DMI quirks for ASUS Vivobook E1504GA and E1504GAB")
Cc: All applicable <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Link: https://patch.msgid.link/20240927141606.66826-1-hdegoede@xxxxxxxxxx
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/resource.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 8a4726e2eb69..1ff251fd1901 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -511,19 +511,12 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
},
},
{
- /* Asus Vivobook E1504GA */
+ /* Asus Vivobook E1504GA* */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "E1504GA"),
},
},
- {
- /* Asus Vivobook E1504GAB */
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_BOARD_NAME, "E1504GAB"),
- },
- },
{
/* Asus Vivobook Pro N6506MV */
.matches = {
--
2.46.2
Patches currently in stable-queue which might be from hdegoede@xxxxxxxxxx are
queue-6.10/platform-x86-lenovo-ymc-ignore-the-0x0-state.patch
queue-6.10/platform-x86-touchscreen_dmi-add-nanote-next-quirk.patch
queue-6.10/acpi-ec-do-not-release-locks-during-operation-region.patch
queue-6.10/power-supply-hwmon-fix-missing-temp1_max_alarm-attribute.patch
queue-6.10/platform-x86-isst-fix-the-kasan-report-slab-out-of-bounds-bug.patch
queue-6.10/acpi-resource-add-asus-vivobook-x1704vap-to-irq1_level_low_skip_override.patch
queue-6.10/acpi-resource-add-asus-expertbook-b2502cva-to-irq1_level_low_skip_override.patch
queue-6.10/platform-x86-x86-android-tablets-adjust-xiaomi-pad-2.patch
queue-6.10/acpi-resource-loosen-the-asus-e1404gab-dmi-match-to-also-cover-the-e1404ga.patch
queue-6.10/acpi-video-add-backlight-native-quirk-for-dell-optiplex-5480-aio.patch
queue-6.10/platform-x86-x86-android-tablets-fix-use-after-free-on-platform_device_register-errors.patch
queue-6.10/hid-ignore-battery-for-all-elan-i2c-hid-devices.patch
queue-6.10/platform-mellanox-mlxbf-pmc-fix-lockdep-warning.patch
queue-6.10/acpi-resource-remove-duplicate-asus-e1504gab-irq-override.patch
queue-6.10/platform-x86-amd-pmf-add-quirk-for-tuf-gaming-a14.patch
queue-6.10/acpi-video-add-force_vendor-quirk-for-panasonic-toug.patch
queue-6.10/hid-i2c-hid-ensure-various-commands-do-not-interfere.patch
