diff --git a/[refs] b/[refs] index 9f04e42217c3..5157aca913a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 990a55eb25d9698d61352264cc43f3a9c04cce90 +refs/heads/master: c36ba80ea01d0aecb652c26799a912e760ce8981 diff --git a/trunk/kernel/irq/resend.c b/trunk/kernel/irq/resend.c index 89c7117acf2b..090c3763f3a2 100644 --- a/trunk/kernel/irq/resend.c +++ b/trunk/kernel/irq/resend.c @@ -70,8 +70,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq) if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY; - if (!desc->chip || !desc->chip->retrigger || - !desc->chip->retrigger(irq)) { + if (!desc->chip->retrigger || !desc->chip->retrigger(irq)) { #ifdef CONFIG_HARDIRQS_SW_RESEND /* Set it pending and activate the softirq: */ set_bit(irq, irqs_resend);