diff options
| author | Imre Deak <imre.deak@solidboot.com> | 2006-09-16 15:15:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-16 15:54:30 -0400 |
| commit | e1ed7ac77b63abb6b3a2c0b4b070f50da5b1fb2f (patch) | |
| tree | f82b0558b445cdae2ebf377c19e6409cef7679e0 | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (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>
| -rw-r--r-- | kernel/irq/resend.c | 3 |
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) | |||
| 63 | desc->chip->enable(irq); | 63 | desc->chip->enable(irq); |
| 64 | 64 | ||
| 65 | if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { | 65 | if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { |
| 66 | desc->status &= ~IRQ_PENDING; | 66 | desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY; |
| 67 | desc->status = status | IRQ_REPLAY; | ||
| 68 | 67 | ||
| 69 | if (!desc->chip || !desc->chip->retrigger || | 68 | if (!desc->chip || !desc->chip->retrigger || |
| 70 | !desc->chip->retrigger(irq)) { | 69 | !desc->chip->retrigger(irq)) { |