Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / kernel / irq / resend.c

diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 35f10f7ff94aec43957fa71e7e97cf8f67b22b73..c382727468876dbd84c2ba6b9e89ae5a6464de1e 100644 (file)
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -38,7 +38,7 @@ static void resend_irqs(unsigned long arg)
                clear_bit(irq, irqs_resend);
                desc = irq_desc + irq;
                local_irq_disable();
-               desc->handle_irq(irq, desc, NULL);
+               desc->handle_irq(irq, desc);
                local_irq_enable();
        }
 }
@@ -62,6 +62,15 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
         */
        desc->chip->enable(irq);
 
+       /*
+        * Temporary hack to figure out more about the problem, which
+        * is causing the ancient network cards to die.
+        */
+       if (desc->handle_irq != handle_edge_irq) {
+               WARN_ON_ONCE(1);
+               return;
+       }
+
        if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
                desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;