summaryrefslogtreecommitdiff
path: root/kernel/irq/handle.c
diff options
context:
space:
mode:
authorIan Wisbon <ian.wisbon@timesys.com>2011-02-14 16:41:03 -0500
committerIan Wisbon <ian.wisbon@timesys.com>2011-02-14 16:41:03 -0500
commit8a83780a187ba1961380814eaf9c503043345d12 (patch)
tree80f5d89cca49330e137688c72fb10c9f42dc5663 /kernel/irq/handle.c
parent14a4057959f8ee0a2249eb2abd64fd6b1f571d98 (diff)
Digi Release Code from del-5.6/main2.6.31-digi-201102141643
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r--kernel/irq/handle.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index e8108a1a0eaf..929ecec50913 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -369,6 +369,9 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
irqreturn_t ret, retval = IRQ_NONE;
unsigned int status = 0;
+ if (!(action->flags & IRQF_DISABLED))
+ local_irq_enable_in_hardirq();
+
do {
trace_irq_handler_entry(irq, action);
ret = action->handler(irq, action->dev_id);