From 46c18c6f71ae75964f5f25746ef513faf2934952 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 20 Jun 2010 22:07:48 +0000
Subject: [PATCH] --- yaml --- r: 200552 b: refs/heads/master c:
 ed770f01360b392564650bf1553ce723fa46afec h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/cpmac.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 127daad1729a..bc18315b3478 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9735b7ef005aaef5e5905cddba893f8725cd8867
+refs/heads/master: ed770f01360b392564650bf1553ce723fa46afec
diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c
index 3c58db595285..23786ee34bed 100644
--- a/trunk/drivers/net/cpmac.c
+++ b/trunk/drivers/net/cpmac.c
@@ -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))) {