DaVinci EMAC: correct param for ISR
authorTonyliu <Bo.Liu@windriver.com>
Wed, 4 Nov 2009 13:45:02 +0000 (05:45 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Nov 2009 13:45:02 +0000 (05:45 -0800)
emac_irq is declared as:

static irqreturn_t emac_irq(int irq, void *dev_id)
{
       struct net_device *ndev = (struct net_device *)dev_id;
       struct emac_priv *priv = netdev_priv(ndev);
    ...

Clearly emac_irq() needs "struct net_device *" as "void *dev_id", so correct this.

Signed-off-by: Tonyliu <Bo.Liu@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/davinci_emac.c

index f72c56dec33c668f3056dcb74184ca0be49f14c4..3179521aee90152ea16a886f023eba620247ea45 100644 (file)
@@ -2221,7 +2221,7 @@ void emac_poll_controller(struct net_device *ndev)
        struct emac_priv *priv = netdev_priv(ndev);
 
        emac_int_disable(priv);
-       emac_irq(ndev->irq, priv);
+       emac_irq(ndev->irq, ndev);
        emac_int_enable(priv);
 }
 #endif