From 0fdc30b2adfee3a2ff743bca9535c1399127c960 Mon Sep 17 00:00:00 2001 From: Finn Thain Date: Tue, 21 Jul 2009 12:21:49 -0700 Subject: [PATCH] --- yaml --- r: 155669 b: refs/heads/master c: 4564cba71637d3b4ea3730f5637b21a9eb3c8999 h: refs/heads/master i: 155667: 3ca8917a795db0d359af3567bf4f979158448ebe v: v3 --- [refs] | 2 +- trunk/drivers/net/jazzsonic.c | 1 + trunk/drivers/net/macsonic.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 17c3e6eb39c9..9026a8da6b25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25177476675142d3ebd60849e0cebc46bd1eef8e +refs/heads/master: 4564cba71637d3b4ea3730f5637b21a9eb3c8999 diff --git a/trunk/drivers/net/jazzsonic.c b/trunk/drivers/net/jazzsonic.c index d12106b47bf2..2f286091394d 100644 --- a/trunk/drivers/net/jazzsonic.c +++ b/trunk/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/trunk/drivers/net/macsonic.c b/trunk/drivers/net/macsonic.c index 8f492c7b8093..61eabcac734c 100644 --- a/trunk/drivers/net/macsonic.c +++ b/trunk/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);