summaryrefslogtreecommitdiff
path: root/kernel/irq
diff options
context:
space:
mode:
authorImre Deak <imre.deak@solidboot.com>2006-09-16 12:15:35 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-16 12:54:30 -0700
commite1ed7ac77b63abb6b3a2c0b4b070f50da5b1fb2f (patch)
treef82b0558b445cdae2ebf377c19e6409cef7679e0 /kernel/irq
parent63b98080daa35f0d682db04f4fb7ada010888752 (diff)
[PATCH] genirq: fix typo in IRQ resend
Fix a bug where the IRQ_PENDING flag is never cleared and the ISR is called endlessly without an actual interrupt. Signed-off-by: Imre Deak <imre.deak@solidboot.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/resend.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 872f91ba2ce8..35f10f7ff94a 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -63,8 +63,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
desc->chip->enable(irq);
if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
- desc->status &= ~IRQ_PENDING;
- desc->status = status | IRQ_REPLAY;
+ desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
if (!desc->chip || !desc->chip->retrigger ||
!desc->chip->retrigger(irq)) {