Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d78f8dd3 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110202212551.918484270@linutronix.de>
parent 3aae994f

kernel/irq/chip.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) 
	if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||

	if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||

		    !desc->action)) {

		    !desc->action)) {

		if (!irq_check_poll(desc)) {

		if (!irq_check_poll(desc)) {

			desc->status |= (IRQ_PENDING | IRQ_MASKED);

			desc->status |= IRQ_PENDING;

			mask_ack_irq(desc);

			mask_ack_irq(desc);

			goto out_unlock;

			goto out_unlock;

		}

		}