Skip to content

Commit

Permalink
genirq: Do not fiddle with IRQ_MASKED in handle_edge_irq()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner committed Feb 19, 2011
1 parent 3aae994 commit d78f8dd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/irq/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
!desc->action)) {
if (!irq_check_poll(desc)) {
desc->status |= (IRQ_PENDING | IRQ_MASKED);
desc->status |= IRQ_PENDING;
mask_ack_irq(desc);
goto out_unlock;
}
Expand Down

0 comments on commit d78f8dd

Please sign in to comment.