---

yaml --- r: 200552 b: refs/heads/master c: ed770f0 h: refs/heads/master v: v3
git-mirror · Jun 26, 2010 · 46c18c6 · 46c18c6
1 parent 65f08af
commit 46c18c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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))) {