Commit 5c0d6b34 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds

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: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4fa43501
...@@ -4396,7 +4396,7 @@ static void sky2_shutdown(struct pci_dev *pdev) ...@@ -4396,7 +4396,7 @@ static void sky2_shutdown(struct pci_dev *pdev)
if (!hw) if (!hw)
return; return;
napi_disable(&hw->napi); del_timer_sync(&hw->watchdog_timer);
for (i = 0; i < hw->ports; i++) { for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i]; struct net_device *dev = hw->dev[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment