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];