---

yaml --- r: 68757 b: refs/heads/master c: 5c0d6b3 h: refs/heads/master i: 68755: e82f6d1 v: v3
git-mirror · Oct 14, 2007 · 25f8a70 · 25f8a70
1 parent 00fca44
commit 25f8a70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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];