From 0af8a30cf52874409f4a39dcfa77d24c5172a3a0 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 29 May 2012 18:47:37 +0000 Subject: [PATCH] --- yaml --- r: 309517 b: refs/heads/master c: 2e1d4a065a77d076a679df22a4eddbc7e33cad98 h: refs/heads/master i: 309515: a4d269f7878142b281e40b5f86321def246bae66 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/smsc/smsc911x.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6532be591c24..98dc5b100576 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bbf372c6c60255585783bb08ab477a72b918196 +refs/heads/master: 2e1d4a065a77d076a679df22a4eddbc7e33cad98 diff --git a/trunk/drivers/net/ethernet/smsc/smsc911x.c b/trunk/drivers/net/ethernet/smsc/smsc911x.c index dab9c6f671ec..1466e5d2af44 100644 --- a/trunk/drivers/net/ethernet/smsc/smsc911x.c +++ b/trunk/drivers/net/ethernet/smsc/smsc911x.c @@ -2390,11 +2390,11 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) retval = smsc911x_request_resources(pdev); if (retval) - goto out_return_resources; + goto out_request_resources_fail; retval = smsc911x_enable_resources(pdev); if (retval) - goto out_disable_resources; + goto out_enable_resources_fail; if (pdata->ioaddr == NULL) { SMSC_WARN(pdata, probe, "Error smsc911x base address invalid"); @@ -2501,8 +2501,9 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) free_irq(dev->irq, dev); out_disable_resources: (void)smsc911x_disable_resources(pdev); -out_return_resources: +out_enable_resources_fail: smsc911x_free_resources(pdev); +out_request_resources_fail: platform_set_drvdata(pdev, NULL); iounmap(pdata->ioaddr); free_netdev(dev);