GIT: unionfs2-2.6.27.y: cpmac: do not leak struct net_device on phy_connect errors

[Erez Zadok]

commit 1a9e5fa66baa4dfd6bc366fbe84b172c6da9321b
Author: Florian Fainelli <florian at openwrt.org>
Date:   Sun Jun 20 22:07:48 2010 +0000

    cpmac: do not leak struct net_device on phy_connect errors
    
    commit ed770f01360b392564650bf1553ce723fa46afec upstream.
    
    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 at openwrt.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index ec6b0af..5cbdd37 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1174,7 +1174,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))) {