diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 18:17:19 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 18:19:31 +0200 |
| commit | 9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch) | |
| tree | 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /kernel/irq/chip.c | |
| parent | 3c6c65f5ed5a6d307bd607aecd06d658c0934d88 (diff) | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 (diff) | |
| download | op-kernel-dev-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.zip op-kernel-dev-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.tar.gz | |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'kernel/irq/chip.c')
| -rw-r--r-- | kernel/irq/chip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 54105bd..9336f2e 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -261,10 +261,13 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs) * keep it masked and get out of here */ action = desc->action; - if (unlikely(!action || (desc->status & IRQ_DISABLED))) + if (unlikely(!action || (desc->status & IRQ_DISABLED))) { + desc->status |= IRQ_PENDING; goto out; + } desc->status |= IRQ_INPROGRESS; + desc->status &= ~IRQ_PENDING; spin_unlock(&desc->lock); action_ret = handle_IRQ_event(irq, regs, action); |
