From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Sun, 14 Oct 2007 20:25:22 +0000 (-0700)
Subject: sky2: reboot fix
X-Git-Tag: v2.6.24-rc1~1298
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43;p=safe%2Fjmp%2Flinux-2.6

sky2: reboot fix

The call to napi_disable() in the PCI shutdown handler is problematic,
and is aggravated by the new NAPI.
Also, make sure watchdog timer doesn't go off.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 68f728f..7967240 100644
--- a/drivers/net/sky2.c
+++ b/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];