diff options
| author | Chen Yu <yu.c.chen@intel.com> | 2015-10-25 01:02:19 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-11-27 12:48:21 +0000 |
| commit | bf177657504c6091395f7dd7e5916770113df60b (patch) | |
| tree | 8436ceea997b89164d7a8fd98298ae43aa192e14 /drivers | |
| parent | e936d80d4d24e79fe2fd038d33f56830391838c2 (diff) | |
ACPI: Use correct IRQ when uninstalling ACPI interrupt handler
commit 49e4b84333f338d4f183f28f1f3c1131b9fb2b5a upstream.
Currently when the system is trying to uninstall the ACPI interrupt
handler, it uses acpi_gbl_FADT.sci_interrupt as the IRQ number.
However, the IRQ number that the ACPI interrupt handled is installed
for comes from acpi_gsi_to_irq() and that is the number that should
be used for the handler removal.
Fix this problem by using the mapped IRQ returned from acpi_gsi_to_irq()
as appropriate.
Acked-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/osl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7be7aa6b979e..ec965de218a4 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -82,6 +82,7 @@ static struct workqueue_struct *kacpid_wq; static struct workqueue_struct *kacpi_notify_wq; struct workqueue_struct *kacpi_hotplug_wq; EXPORT_SYMBOL(kacpi_hotplug_wq); +unsigned int acpi_sci_irq = INVALID_ACPI_IRQ; struct acpi_res_list { resource_size_t start; @@ -566,17 +567,19 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, acpi_irq_handler = NULL; return AE_NOT_ACQUIRED; } + acpi_sci_irq = irq; return AE_OK; } -acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) +acpi_status acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler handler) { - if (irq != acpi_gbl_FADT.sci_interrupt) + if (gsi != acpi_gbl_FADT.sci_interrupt || !acpi_sci_irq_valid()) return AE_BAD_PARAMETER; - free_irq(irq, acpi_irq); + free_irq(acpi_sci_irq, acpi_irq); acpi_irq_handler = NULL; + acpi_sci_irq = INVALID_ACPI_IRQ; return AE_OK; } |