|
@@ -1142,7 +1142,7 @@ static int cpmac_probe(struct platform_device *pdev)
|
|
mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
|
|
mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
|
|
if (!mem) {
|
|
if (!mem) {
|
|
rc = -ENODEV;
|
|
rc = -ENODEV;
|
|
- goto fail;
|
|
|
|
|
|
+ goto out;
|
|
}
|
|
}
|
|
|
|
|
|
dev->irq = platform_get_irq_byname(pdev, "irq");
|
|
dev->irq = platform_get_irq_byname(pdev, "irq");
|
|
@@ -1170,7 +1170,7 @@ static int cpmac_probe(struct platform_device *pdev)
|
|
dev_err(&pdev->dev, "Could not attach to PHY\n");
|
|
dev_err(&pdev->dev, "Could not attach to PHY\n");
|
|
|
|
|
|
rc = PTR_ERR(priv->phy);
|
|
rc = PTR_ERR(priv->phy);
|
|
- goto fail;
|
|
|
|
|
|
+ goto out;
|
|
}
|
|
}
|
|
|
|
|
|
rc = register_netdev(dev);
|
|
rc = register_netdev(dev);
|
|
@@ -1189,6 +1189,7 @@ static int cpmac_probe(struct platform_device *pdev)
|
|
|
|
|
|
fail:
|
|
fail:
|
|
free_netdev(dev);
|
|
free_netdev(dev);
|
|
|
|
+out:
|
|
return rc;
|
|
return rc;
|
|
}
|
|
}
|
|
|
|
|