net: cpmac: fix in releasing resources

bhadram · davem330 · commit 0465be8f4f1d · 2014-07-10T00:40:37.000-07:00
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 &lt;varkab@cdac.in&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1142,7 +1142,7 @@ static int cpmac_probe(struct platform_device *pdev)`
`1142`	`1142`	`mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");`
`1143`	`1143`	`if (!mem) {`
`1144`	`1144`	`rc = -ENODEV;`
`1145`		`- goto fail;`
	`1145`	`+ goto out;`
`1146`	`1146`	`}`
`1147`	`1147`
`1148`	`1148`	`dev->irq = platform_get_irq_byname(pdev, "irq");`
`@@ -1170,7 +1170,7 @@ static int cpmac_probe(struct platform_device *pdev)`
`1170`	`1170`	`dev_err(&pdev->dev, "Could not attach to PHY\n");`
`1171`	`1171`
`1172`	`1172`	`rc = PTR_ERR(priv->phy);`
`1173`		`- goto fail;`
	`1173`	`+ goto out;`
`1174`	`1174`	`}`
`1175`	`1175`
`1176`	`1176`	`rc = register_netdev(dev);`
`@@ -1189,6 +1189,7 @@ static int cpmac_probe(struct platform_device *pdev)`
`1189`	`1189`
`1190`	`1190`	`fail:`
`1191`	`1191`	`free_netdev(dev);`
	`1192`	`+out:`
`1192`	`1193`	`return rc;`
`1193`	`1194`	`}`
`1194`	`1195`