Merge branch 'misc-2.6.32' into release

[cascardo/linux.git] / kernel / irq / resend.c

diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 89c7117..090c376 100644 (file)
--- a/kernel/irq/resend.c
+++ b/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);