aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 03209a37883e..5c811f3fa11a 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -8393,7 +8393,7 @@ bnx2_remove_one(struct pci_dev *pdev)
8393 struct net_device *dev = pci_get_drvdata(pdev); 8393 struct net_device *dev = pci_get_drvdata(pdev);
8394 struct bnx2 *bp = netdev_priv(dev); 8394 struct bnx2 *bp = netdev_priv(dev);
8395 8395
8396 flush_scheduled_work(); 8396 cancel_work_sync(&bp->reset_task);
8397 8397
8398 unregister_netdev(dev); 8398 unregister_netdev(dev);
8399 8399
@@ -8431,7 +8431,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
8431 if (!netif_running(dev)) 8431 if (!netif_running(dev))
8432 return 0; 8432 return 0;
8433 8433
8434 flush_scheduled_work(); 8434 cancel_work_sync(&bp->reset_task);
8435 bnx2_netif_stop(bp, true); 8435 bnx2_netif_stop(bp, true);
8436 netif_device_detach(dev); 8436 netif_device_detach(dev);
8437 del_timer_sync(&bp->timer); 8437 del_timer_sync(&bp->timer);