summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2020-05-27 13:37:00 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-05-27 17:51:49 +0200
commite5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9 (patch)
treeb997fad10de1e296007c0cac3762117317185289
parentACPI: GED: add support for _Exx / _Lxx handler methods (diff)
downloadlinux-e5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9.tar.xz
linux-e5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9.zip
ACPI: GED: use correct trigger type field in _Exx / _Lxx handling
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>
-rw-r--r--drivers/acpi/evged.c2
1 files changed, 1 insertions, 1 deletions
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;