diff options
author | Tonyliu <Bo.Liu@windriver.com> | 2009-11-04 08:45:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-04 08:45:02 -0500 |
commit | c8ee5538b091b8aca9ca738c6989c5ad6f9e67c0 (patch) | |
tree | 141b65882bf17519e3f533d5583248cadb0462d0 | |
parent | 3a19d56c71bd3a08412d609d219ac8eec0819166 (diff) |
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>
-rw-r--r-- | drivers/net/davinci_emac.c | 2 |
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) | |||
2221 | struct emac_priv *priv = netdev_priv(ndev); | 2221 | struct emac_priv *priv = netdev_priv(ndev); |
2222 | 2222 | ||
2223 | emac_int_disable(priv); | 2223 | emac_int_disable(priv); |
2224 | emac_irq(ndev->irq, priv); | 2224 | emac_irq(ndev->irq, ndev); |
2225 | emac_int_enable(priv); | 2225 | emac_int_enable(priv); |
2226 | } | 2226 | } |
2227 | #endif | 2227 | #endif |