---

yaml --- r: 214324 b: refs/heads/master c: e8f7f43 h: refs/heads/master v: v3
git-mirror · Sep 7, 2010 · 9abf8e1 · 9abf8e1
1 parent d3d403b
commit 9abf8e1
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: 1fd63041c49c5c6ed1fe58b7bccc2de462d51e2b
+refs/heads/master: e8f7f43a4ad451ecfb2689985f99a9e276a08bba
diff --git a/trunk/drivers/net/fs_enet/fs_enet-main.c b/trunk/drivers/net/fs_enet/fs_enet-main.c
@@ -1036,7 +1036,7 @@ static int __devinit fs_enet_probe(struct platform_device *ofdev,
 	ndev = alloc_etherdev(privsize);
 	if (!ndev) {
 		ret = -ENOMEM;
-		goto out_free_fpi;
+		goto out_put;
 	}
 
 	SET_NETDEV_DEV(ndev, &ofdev->dev);
@@ -1099,6 +1099,7 @@ static int __devinit fs_enet_probe(struct platform_device *ofdev,
 out_free_dev:
 	free_netdev(ndev);
 	dev_set_drvdata(&ofdev->dev, NULL);
+out_put:
 	of_node_put(fpi->phy_node);
 out_free_fpi:
 	kfree(fpi);