summaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-07 21:02:10 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:16 +0100
commit3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6 (patch)
treef496998278faa653174e185924acb0c74ac2e1b2 /kernel/irq/chip.c
parent009b4c3b8ad584b3462734127a5bec680d5d6af4 (diff)
downloadlinux-3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6.tar.gz
linux-3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6.tar.bz2
linux-3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6.zip
genirq: Move IRQ_ONESHOT to core
No users outside of core. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 075385549dcd..420fa6bdb117 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -472,7 +472,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
handle_irq_event(desc);
- if (!(desc->status & (IRQ_DISABLED | IRQ_ONESHOT)))
+ if (!(desc->status & IRQ_DISABLED) && !(desc->istate & IRQS_ONESHOT))
unmask_irq(desc);
out_unlock:
raw_spin_unlock(&desc->lock);