diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2009-07-21 12:21:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-21 12:21:49 -0700 |
| commit | 4564cba71637d3b4ea3730f5637b21a9eb3c8999 (patch) | |
| tree | 1b33d48ab32e9b69c850e250eef27620c513c8a7 | |
| parent | 25177476675142d3ebd60849e0cebc46bd1eef8e (diff) | |
| download | linux-4564cba71637d3b4ea3730f5637b21a9eb3c8999.tar.gz linux-4564cba71637d3b4ea3730f5637b21a9eb3c8999.tar.bz2 linux-4564cba71637d3b4ea3730f5637b21a9eb3c8999.zip | |
macsonic, jazzsonic: fix oops on module unload
Set the driver data before using it. Fixes an oops when doing rmmod.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/jazzsonic.c | 1 | ||||
| -rw-r--r-- | drivers/net/macsonic.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index d12106b47bf2..2f286091394d 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c @@ -229,6 +229,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev) lp = netdev_priv(dev); lp->device = &pdev->dev; SET_NETDEV_DEV(dev, &pdev->dev); + platform_set_drvdata(pdev, dev); netdev_boot_setup_check(dev); diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index 8f492c7b8093..61eabcac734c 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c @@ -575,6 +575,7 @@ static int __devinit mac_sonic_probe(struct platform_device *pdev) lp = netdev_priv(dev); lp->device = &pdev->dev; SET_NETDEV_DEV(dev, &pdev->dev); + platform_set_drvdata(pdev, dev); /* This will catch fatal stuff like -ENOMEM as well as success */ err = mac_onboard_sonic_probe(dev); |