diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:22:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:22:36 -0400 |
| commit | 3482a6f1d1447b618d37049529cf36a8dc3bd3e3 (patch) | |
| tree | ce99d85801ba09690d8ab0f823c7874f7042a0a3 /kernel/irq/spurious.c | |
| parent | 59d42c0eb1d8fdfeec18f4ff088de8084bda906b (diff) | |
| parent | 1adb0850a1254333d81e64121c80af100c6d6e06 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq:
genirq: reenable a nobody cared disabled irq when a new driver arrives
Diffstat (limited to 'kernel/irq/spurious.c')
| -rw-r--r-- | kernel/irq/spurious.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 088dabbf2d6a..c66d3f10e853 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
| @@ -209,8 +209,8 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, | |||
| 209 | * Now kill the IRQ | 209 | * Now kill the IRQ |
| 210 | */ | 210 | */ |
| 211 | printk(KERN_EMERG "Disabling IRQ #%d\n", irq); | 211 | printk(KERN_EMERG "Disabling IRQ #%d\n", irq); |
| 212 | desc->status |= IRQ_DISABLED; | 212 | desc->status |= IRQ_DISABLED | IRQ_SPURIOUS_DISABLED; |
| 213 | desc->depth = 1; | 213 | desc->depth++; |
| 214 | desc->chip->disable(irq); | 214 | desc->chip->disable(irq); |
| 215 | } | 215 | } |
| 216 | desc->irqs_unhandled = 0; | 216 | desc->irqs_unhandled = 0; |