Skip to content

Commit

Permalink
cpmac: do not leak struct net_device on phy_connect errors
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Jun 26, 2010
1 parent 9735b7e commit ed770f0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/cpmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
if (netif_msg_drv(priv))
printk(KERN_ERR "%s: Could not attach to PHY\n",
dev->name);
return PTR_ERR(priv->phy);
rc = PTR_ERR(priv->phy);
goto fail;
}

if ((rc = register_netdev(dev))) {
Expand Down

0 comments on commit ed770f0

Please sign in to comment.