From 244e4724707cdc8b79fb3227d978b6cc1f92f0eb Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurentp@cse-semaphore.com>
Date: Fri, 11 Apr 2008 14:05:50 +0200
Subject: [PATCH] --- yaml --- r: 88293 b: refs/heads/master c:
 9a3c243d7d87f401682247dbeff94067d814c192 h: refs/heads/master i:   88291:
 b64b42ce39d1e73be27193f0be26580c81c044c6 v: v3

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

diff --git a/[refs] b/[refs]
index a9a932f1395a..1fb3f497f893 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c63eddb200690023e7c67f4dd9f132ad91660517
+refs/heads/master: 9a3c243d7d87f401682247dbeff94067d814c192
diff --git a/trunk/drivers/net/fs_enet/fs_enet-main.c b/trunk/drivers/net/fs_enet/fs_enet-main.c
index af869cf9ae7d..940e2041ba38 100644
--- a/trunk/drivers/net/fs_enet/fs_enet-main.c
+++ b/trunk/drivers/net/fs_enet/fs_enet-main.c
@@ -835,7 +835,8 @@ static int fs_enet_close(struct net_device *dev)
 
 	netif_stop_queue(dev);
 	netif_carrier_off(dev);
-	napi_disable(&fep->napi);
+	if (fep->fpi->use_napi)
+		napi_disable(&fep->napi);
 	phy_stop(fep->phydev);
 
 	spin_lock_irqsave(&fep->lock, flags);