From a5fb023d05305d9233ef79c563988a9712be7d5d Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 17 Aug 2010 06:11:24 +0000 Subject: [PATCH] --- yaml --- r: 213839 b: refs/heads/master c: cb5d991a99104565f7b622b1b97587f4b1effa82 h: refs/heads/master i: 213837: 32538895d374e372235d96da306c4bd0bb8902bb 213835: 657d5a180378d8c011e4b35f651c12fdfc0e1dfe 213831: 661a6c52d1bc3de4e530c124d095b4f3f3cb215e 213823: 074bdce7e4c33c6c63d931e604d95ac9b05a1e96 v: v3 --- [refs] | 2 +- trunk/drivers/net/greth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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; }