[PATCH 1/2] smsc911x: don't clobber driver_data

[PATCH 1/2] smsc911x: don't clobber driver_data

[Steve Glendinning]

smsc911x uses driver_data to store our net_device, don't overwrite this
with the mii_bus.

Reported and fixed by dfoley@telus.net.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
---
 drivers/net/smsc911x.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index fa28542..cd925de 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -822,7 +822,6 @@ static int __devinit smsc911x_mii_init(struct platform_device *pdev,
 		pdata->mii_bus->irq[i] = PHY_POLL;
 
 	pdata->mii_bus->parent = &pdev->dev;
-	dev_set_drvdata(&pdev->dev, &pdata->mii_bus);
 
 	pdata->using_extphy = 0;
 
-- 
1.6.0.4

[PATCH 2/2] smsc911x: fix platform resource call during module unload

[Steve Glendinning]

This patch fixes a typo, the platform_get_resource calls in
smsc911x_drv_remove are supposed to look the same as those in
smsc911x_drv_probe.

Reported and fixed by dfoley@telus.net.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
---
 drivers/net/smsc911x.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index cd925de..a33c5fc 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -1871,7 +1871,7 @@ static int __devexit smsc911x_drv_remove(struct platform_device *pdev)
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
 					   "smsc911x-memory");
 	if (!res)
-		platform_get_resource(pdev, IORESOURCE_MEM, 0);
+		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
 	release_mem_region(res->start, res->end - res->start);
 
-- 
1.6.0.4

Re: [PATCH 1/2] smsc911x: don't clobber driver_data

[David Miller]

From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Fri, 19 Dec 2008 18:05:29 +0000

> smsc911x uses driver_data to store our net_device, don't overwrite this
> with the mii_bus.
> 
> Reported and fixed by dfoley@telus.net.
> 
> Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>

Applied.

Re: [PATCH 2/2] smsc911x: fix platform resource call during module unload

[David Miller]

From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Fri, 19 Dec 2008 18:05:30 +0000

> This patch fixes a typo, the platform_get_resource calls in
> smsc911x_drv_remove are supposed to look the same as those in
> smsc911x_drv_probe.
> 
> Reported and fixed by dfoley@telus.net.
> 
> Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>

Also applied, thanks Steve.