1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 5faa87d86c66..57e19fb1324f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -15034,7 +15034,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
                 if (tp->fw)
                         release_firmware(tp->fw);
 
-                flush_scheduled_work();
+                cancel_work_sync(&tp->reset_task);
 
                 if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
                         tg3_phy_fini(tp);
@@ -15073,7 +15073,7 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
         if (!netif_running(dev))
                 return 0;
 
-        flush_scheduled_work();
+        flush_work_sync(&tp->reset_task);
         tg3_phy_stop(tp);
         tg3_netif_stop(tp);