blob: 06474cb45ac7e5e390c1c0fcb3f14c483119a505 [file] [log] [blame]
From f4d72a8d2baa44d08166ffe0b420b66dbc9f8bbf Mon Sep 17 00:00:00 2001
From: Ard Biesheuvel <>
Date: Wed, 27 May 2020 13:37:00 +0200
Subject: [PATCH] ACPI: GED: use correct trigger type field in _Exx / _Lxx
commit e5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9 upstream.
Commit ea6f3af4c5e63f69 ("ACPI: GED: add support for _Exx / _Lxx handler
methods") added a reference to the 'triggering' field of either the
normal or the extended ACPI IRQ resource struct, but inadvertently used
the wrong pointer in the latter case. Note that both pointers refer to the
same union, and the 'triggering' field appears at the same offset in both
struct types, so it currently happens to work by accident. But let's fix
it nonetheless
Fixes: ea6f3af4c5e63f69 ("ACPI: GED: add support for _Exx / _Lxx handler methods")
Signed-off-by: Ard Biesheuvel <>
Signed-off-by: Rafael J. Wysocki <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c
index 6d7a522952bf..ccd900690b6f 100644
--- a/drivers/acpi/evged.c
+++ b/drivers/acpi/evged.c
@@ -94,7 +94,7 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares,
trigger = p->triggering;
} else {
gsi = pext->interrupts[0];
- trigger = p->triggering;
+ trigger = pext->triggering;
irq = r.start;