cpmac: do not leak struct net_device on phy_connect errors
authorFlorian Fainelli <florian@openwrt.org>
Sun, 20 Jun 2010 22:07:48 +0000 (22:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Jun 2010 04:16:58 +0000 (21:16 -0700)
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>
drivers/net/cpmac.c

index 3c58db5952852ad5319741c7135e452e2ad086a0..23786ee34beded0a9ae6d2c0484ca75965eeab93 100644 (file)
@@ -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))) {