From 7996bd5292e63854f5e437d854c0d8b4216c58fc Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Wed, 17 Oct 2007 23:57:46 +0400
Subject: [PATCH] --- yaml --- r: 71372 b: refs/heads/master c:
 db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0e845546e038..766d72d9fc01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f860f49ee2e59d1a665416c9155cad7661ee0552
+refs/heads/master: db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index cc288d8f6a53..38268d7335a8 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -956,10 +956,12 @@ static int gfar_enet_open(struct net_device *dev)
 	}
 
 	err = startup_gfar(dev);
-	if (err)
+	if (err) {
 #ifdef CONFIG_GFAR_NAPI
 		napi_disable(&priv->napi);
 #endif
+		return err;
+	}
 
 	netif_start_queue(dev);