aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-02 16:41:17 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 06:58:11 -0500
commitd78f8dd36b90626106ce19cb2e6828b0dc39447e (patch)
treebf142bff631dda1f129dccd08cf162acac6df07c /kernel/irq/chip.c
parent3aae994fb0f43f6d94a31c33536a83869504abdf (diff)
genirq: Do not fiddle with IRQ_MASKED in handle_edge_irq()
IRQ_MASKED is set in mask_ack_irq() anyway. Remove it from handle_edge_irq() to allow simpler ab^HHreuse of that function. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <20110202212551.918484270@linutronix.de>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 43c62ca68c11..2c30b7844595 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
611 if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) || 611 if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
612 !desc->action)) { 612 !desc->action)) {
613 if (!irq_check_poll(desc)) { 613 if (!irq_check_poll(desc)) {
614 desc->status |= (IRQ_PENDING | IRQ_MASKED); 614 desc->status |= IRQ_PENDING;
615 mask_ack_irq(desc); 615 mask_ack_irq(desc);
616 goto out_unlock; 616 goto out_unlock;
617 } 617 }