aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-03-21 14:23:27 +0100
committerIngo Molnar <mingo@kernel.org>2017-03-21 14:23:27 +0100
commit03630b2a3d58d5bec2cf0273c0a962a37ace517d (patch)
tree368bb707e50897e56e42d1bfcf729972ed736943 /kernel
parent6a5b4e006e1dceaf46985c59b2bfd0bb2f8077d4 (diff)
parent45e5202213ae6541f7916bb3c64fbcd3019ec473 (diff)
Merge branch 'irq/core'
Diffstat (limited to 'kernel')
-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 be3c34e4f2ac..686be4b73018 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -348,7 +348,10 @@ void handle_nested_irq(unsigned int irq)
irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
raw_spin_unlock_irq(&desc->lock);
- action_ret = action->thread_fn(action->irq, action->dev_id);
+ action_ret = IRQ_NONE;
+ for_each_action_of_desc(desc, action)
+ action_ret |= action->thread_fn(action->irq, action->dev_id);
+
if (!noirqdebug)
note_interrupt(desc, action_ret);