|
@@ -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 @@ out_free_irq:
|
|
|
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);
|