aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/chip.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 8736f2ca8a3b..a99047a324eb 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -311,10 +311,13 @@ handle_fastack_irq(unsigned int irq, struct irq_desc *desc,
311 * keep it masked and get out of here 311 * keep it masked and get out of here
312 */ 312 */
313 action = desc->action; 313 action = desc->action;
314 if (unlikely(!action || (desc->status & IRQ_DISABLED))) 314 if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
315 desc->status |= IRQ_PENDING;
315 goto out; 316 goto out;
317 }
316 318
317 desc->status |= IRQ_INPROGRESS; 319 desc->status |= IRQ_INPROGRESS;
320 desc->status &= ~IRQ_PENDING;
318 spin_unlock(&desc->lock); 321 spin_unlock(&desc->lock);
319 322
320 action_ret = handle_IRQ_event(irq, regs, action); 323 action_ret = handle_IRQ_event(irq, regs, action);