summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2012-04-18 12:29:32 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-18 10:16:27 -0700
commit9ecf8c0d4f2ea5eb39e0924d9b102b5c3300f291 (patch)
tree5b88deede3546856c10fd450bd1020247f416888 /drivers/acpi/osl.c
parent592fe8980688e7cba46897685d014c7fb3018a67 (diff)
downloadlinux-stable-9ecf8c0d4f2ea5eb39e0924d9b102b5c3300f291.tar.gz
linux-stable-9ecf8c0d4f2ea5eb39e0924d9b102b5c3300f291.tar.bz2
linux-stable-9ecf8c0d4f2ea5eb39e0924d9b102b5c3300f291.zip
Revert "ACPI: Make ACPI interrupt threaded"
This reverts commit 6fe0d0628245fdcd6fad8b837c81e8f7ebc3364d. Paul bisected this regression. The conversion was done blindly and is wrong, as it does not provide a primary handler to disable the level type irq on the device level. Neither does it set the IRQF_ONESHOT flag which handles that at the irq line level. This can't be done as the interrupt might be shared, though we might extend the core to force it. So an interrupt on this line will wake up the thread, but immediately unmask the irq after that. Due to the interrupt being level type the hardware interrupt is raised over and over and prevents the irq thread from handling it. Fail. request_irq() unfortunately does not refuse such a request and the patch was obviously never tested with real interrupts. Bisected-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r--drivers/acpi/osl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index ba14fb93c929..c3881b2eb8b2 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -607,8 +607,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
acpi_irq_handler = handler;
acpi_irq_context = context;
- if (request_threaded_irq(irq, NULL, acpi_irq, IRQF_SHARED, "acpi",
- acpi_irq)) {
+ if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {
printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
acpi_irq_handler = NULL;
return AE_NOT_ACQUIRED;