| From ed770f01360b392564650bf1553ce723fa46afec Mon Sep 17 00:00:00 2001 |
| From: Florian Fainelli <florian@openwrt.org> |
| Date: Sun, 20 Jun 2010 22:07:48 +0000 |
| Subject: cpmac: do not leak struct net_device on phy_connect errors |
| |
| From: Florian Fainelli <florian@openwrt.org> |
| |
| 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@openwrt.org> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/cpmac.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/cpmac.c |
| +++ b/drivers/net/cpmac.c |
| @@ -1174,7 +1174,8 @@ static int __devinit cpmac_probe(struct |
| 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))) { |
