From 25f8a70d7339695243266ed8f00b1c712ce68937 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Sun, 14 Oct 2007 13:25:22 -0700
Subject: [PATCH] --- yaml --- r: 68757 b: refs/heads/master c:
 5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43 h: refs/heads/master i:   68755:
 e82f6d1f85edc6ec63d1fb93286a1ae3b2c1b74d v: v3

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

diff --git a/[refs] b/[refs]
index 29132ee59ec7..82d47f3a6d55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fa435018d740cb83d74c92306aa1f796da91ddd
+refs/heads/master: 5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43
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];