r6040: restore MIER register correctly when IRQ line is shared
authorFlorian Fainelli <florian@openwrt.org>
Wed, 8 Jul 2009 03:05:14 +0000 (03:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Jul 2009 17:49:26 +0000 (10:49 -0700)
When the r6040 device IRQ line is shared we will enter the driver
interrupt service routine, mask off the device interrupt enable
register (MIER) and return with IRQ_NONE, we would then leave the
device with interrupts disabled, this patch fixes that issue.

Reported-by: Steve Holland <sdh4@iastate.edu>
Signed-off-by: Joe Chou <joe.chou@rdc.com.tw>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/r6040.c

index ed63d23a645233f9da9a6e88abb51632fdf5f98d..70aac35dc2dbb36659b716ca9c9d777a61dcc290 100644 (file)
@@ -704,8 +704,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
        /* Read MISR status and clear */
        status = ioread16(ioaddr + MISR);
 
-       if (status == 0x0000 || status == 0xffff)
+       if (status == 0x0000 || status == 0xffff) {
+               /* Restore RDC MAC interrupt */
+               iowrite16(misr, ioaddr + MIER);
                return IRQ_NONE;
+       }
 
        /* RX interrupt request */
        if (status & RX_INTS) {