From 5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sun, 14 Oct 2007 13:25:22 -0700 Subject: 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 Signed-off-by: Linus Torvalds --- drivers/net/sky2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 68f728f0b600..7967240534d5 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]; -- cgit v1.2.3