--- /dev/null
+From e5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9 Mon Sep 17 00:00:00 2001
+From: Ard Biesheuvel <ardb@kernel.org>
+Date: Wed, 27 May 2020 13:37:00 +0200
+Subject: ACPI: GED: use correct trigger type field in _Exx / _Lxx handling
+
+From: Ard Biesheuvel <ardb@kernel.org>
+
+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 <ardb@kernel.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/evged.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/acpi/evged.c
++++ b/drivers/acpi/evged.c
+@@ -94,7 +94,7 @@ static acpi_status acpi_ged_request_inte
+ trigger = p->triggering;
+ } else {
+ gsi = pext->interrupts[0];
+- trigger = p->triggering;
++ trigger = pext->triggering;
+ }
+
+ irq = r.start;