diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-10-14 22:25:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 01:46:44 +0200 |
| commit | 5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43 (patch) | |
| tree | 8e7068459852029148be16ea237acdb4815caa34 /drivers/net/sky2.c | |
| parent | Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 (diff) | |
| download | linux-5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43.tar.xz linux-5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/sky2.c | 2 |
1 files changed, 1 insertions, 1 deletions
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]; |