From: Joe Chou Date: Tue, 23 Dec 2008 03:40:02 +0000 (-0800) Subject: r6040: save and restore MIER correctly in the interrupt routine X-Git-Tag: v2.6.28.2~24 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=60d6957e08cf40a3d1a2648abd990d6d824d5249;p=karo-tx-linux.git r6040: save and restore MIER correctly in the interrupt routine [ Upstream commit: 3e7c469f07ff14cbf9a814739e1fc99a863e0943 ] This patch saves the MIER register contents before treating interrupts, then restores them correcty at the end of the interrupt routine. Signed-off-by: Joe Chou Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index c2e8ac12e673..b6ff173398a1 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -681,8 +681,10 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) struct net_device *dev = dev_id; struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; - u16 status; + u16 misr, status; + /* Save MIER */ + misr = ioread16(ioaddr + MIER); /* Mask off RDC MAC interrupt */ iowrite16(MSK_INT, ioaddr + MIER); /* Read MISR status and clear */ @@ -702,7 +704,7 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) dev->stats.rx_fifo_errors++; /* Mask off RX interrupt */ - iowrite16(ioread16(ioaddr + MIER) & ~RX_INTS, ioaddr + MIER); + misr &= ~RX_INTS; netif_rx_schedule(dev, &lp->napi); } @@ -710,6 +712,9 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) if (status & TX_INTS) r6040_tx(dev); + /* Restore RDC MAC interrupt */ + iowrite16(misr, ioaddr + MIER); + return IRQ_HANDLED; }