Browse Source

cpmac: do not leak struct net_device on phy_connect errors

If the call to phy_connect fails, we will return directly instead of freeing
the previously allocated struct net_device.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
CC: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Florian Fainelli 15 years ago
parent
commit
ed770f0136
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/net/cpmac.c

+ 2 - 1
drivers/net/cpmac.c

@@ -1181,7 +1181,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
 		if (netif_msg_drv(priv))
 		if (netif_msg_drv(priv))
 			printk(KERN_ERR "%s: Could not attach to PHY\n",
 			printk(KERN_ERR "%s: Could not attach to PHY\n",
 			       dev->name);
 			       dev->name);
-		return PTR_ERR(priv->phy);
+		rc = PTR_ERR(priv->phy);
+		goto fail;
 	}
 	}
 
 
 	if ((rc = register_netdev(dev))) {
 	if ((rc = register_netdev(dev))) {