|
@@ -2382,6 +2382,7 @@ boomerang_interrupt(int irq, void *dev_id)
|
|
|
void __iomem *ioaddr;
|
|
void __iomem *ioaddr;
|
|
|
int status;
|
|
int status;
|
|
|
int work_done = max_interrupt_work;
|
|
int work_done = max_interrupt_work;
|
|
|
|
|
+ int handled = 0;
|
|
|
|
|
|
|
|
ioaddr = vp->ioaddr;
|
|
ioaddr = vp->ioaddr;
|
|
|
|
|
|
|
@@ -2400,6 +2401,7 @@ boomerang_interrupt(int irq, void *dev_id)
|
|
|
|
|
|
|
|
if ((status & IntLatch) == 0)
|
|
if ((status & IntLatch) == 0)
|
|
|
goto handler_exit; /* No interrupt: shared IRQs can cause this */
|
|
goto handler_exit; /* No interrupt: shared IRQs can cause this */
|
|
|
|
|
+ handled = 1;
|
|
|
|
|
|
|
|
if (status == 0xffff) { /* h/w no longer present (hotplug)? */
|
|
if (status == 0xffff) { /* h/w no longer present (hotplug)? */
|
|
|
if (vortex_debug > 1)
|
|
if (vortex_debug > 1)
|
|
@@ -2501,7 +2503,7 @@ boomerang_interrupt(int irq, void *dev_id)
|
|
|
handler_exit:
|
|
handler_exit:
|
|
|
vp->handling_irq = 0;
|
|
vp->handling_irq = 0;
|
|
|
spin_unlock(&vp->lock);
|
|
spin_unlock(&vp->lock);
|
|
|
- return IRQ_HANDLED;
|
|
|
|
|
|
|
+ return IRQ_RETVAL(handled);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static int vortex_rx(struct net_device *dev)
|
|
static int vortex_rx(struct net_device *dev)
|