summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ti
diff options
context:
space:
mode:
authorVarka Bhadram <varkab@cdac.in>2014-07-10 07:35:45 +0200
committerDavid S. Miller <davem@davemloft.net>2014-07-10 09:40:37 +0200
commit0465be8f4f1ddb251b25da26f1247581bcb98dbf (patch)
treef9d862d6f00984e82deb5c8eae412f21422a41db /drivers/net/ethernet/ti
parentnet: cpmac: fix proper spacing before return statement (diff)
downloadlinux-0465be8f4f1ddb251b25da26f1247581bcb98dbf.tar.xz
linux-0465be8f4f1ddb251b25da26f1247581bcb98dbf.zip
net: cpmac: fix in releasing resources
before registering the the net device this code freeing net device by using the label 'fail' fixed by introducing an another label 'out' Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
-rw-r--r--drivers/net/ethernet/ti/cpmac.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index b6efe3e0f1ee..b68c5b588742 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1142,7 +1142,7 @@ static int cpmac_probe(struct platform_device *pdev)
mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
if (!mem) {
rc = -ENODEV;
- goto fail;
+ goto out;
}
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");
rc = PTR_ERR(priv->phy);
- goto fail;
+ goto out;
}
rc = register_netdev(dev);
@@ -1189,6 +1189,7 @@ static int cpmac_probe(struct platform_device *pdev)
fail:
free_netdev(dev);
+out:
return rc;
}