summaryrefslogtreecommitdiff
path: root/drivers/net/davinci_emac.c
diff options
context:
space:
mode:
authorTonyliu <Bo.Liu@windriver.com>2009-11-04 16:45:02 +0300
committerDavid S. Miller <davem@davemloft.net>2009-11-04 16:45:02 +0300
commitc8ee5538b091b8aca9ca738c6989c5ad6f9e67c0 (patch)
tree141b65882bf17519e3f533d5583248cadb0462d0 /drivers/net/davinci_emac.c
parent3a19d56c71bd3a08412d609d219ac8eec0819166 (diff)
downloadlinux-c8ee5538b091b8aca9ca738c6989c5ad6f9e67c0.tar.xz
DaVinci EMAC: correct param for ISR
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>
Diffstat (limited to 'drivers/net/davinci_emac.c')
-rw-r--r--drivers/net/davinci_emac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index f72c56dec33c..3179521aee90 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -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