diff --git a/[refs] b/[refs]
index b2f84d6fdbad..1484fce9053c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 900853a4db7098b0e58ddcb732632ac43a7b2148
+refs/heads/master: cb5d991a99104565f7b622b1b97587f4b1effa82
diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c
index f15c64f1cd38..fbeaf70d1727 100644
--- a/trunk/drivers/net/greth.c
+++ b/trunk/drivers/net/greth.c
@@ -1547,10 +1547,10 @@ static int __devinit greth_of_probe(struct platform_device *ofdev, const struct
 	dev->netdev_ops = &greth_netdev_ops;
 	dev->ethtool_ops = &greth_ethtool_ops;
 
-	if (register_netdev(dev)) {
+	err = register_netdev(dev);
+	if (err) {
 		if (netif_msg_probe(greth))
 			dev_err(greth->dev, "netdevice registration failed.\n");
-		err = -ENOMEM;
 		goto error5;
 	}