From 1c3d4d91c13d2af9b401b62a3bb9c96d7021f923 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 14 Oct 2007 16:47:05 -0700
Subject: [PATCH] --- yaml --- r: 68762 b: refs/heads/master c:
 59d66ce238e573fe3369427e91a8291f2cf67891 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f54fb631120e..5106fa36d3c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89039b37be7c34194db0e72f956a5f02cfa30941
+refs/heads/master: 59d66ce238e573fe3369427e91a8291f2cf67891
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 68f728f0b600..7967240534d5 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -4396,7 +4396,7 @@ static void sky2_shutdown(struct pci_dev *pdev)
 	if (!hw)
 		return;
 
-	napi_disable(&hw->napi);
+	del_timer_sync(&hw->watchdog_timer);
 
 	for (i = 0; i < hw->ports; i++) {
 		struct net_device *dev = hw->dev[i];