aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cassini.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cassini.c')
-rw-r--r--drivers/net/cassini.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index d6b6d6aa565a..a8a32bc9aae6 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -3880,7 +3880,7 @@ static int cas_change_mtu(struct net_device *dev, int new_mtu)
3880 schedule_work(&cp->reset_task); 3880 schedule_work(&cp->reset_task);
3881#endif 3881#endif
3882 3882
3883 flush_scheduled_work(); 3883 flush_work_sync(&cp->reset_task);
3884 return 0; 3884 return 0;
3885} 3885}
3886 3886
@@ -5177,7 +5177,7 @@ static void __devexit cas_remove_one(struct pci_dev *pdev)
5177 vfree(cp->fw_data); 5177 vfree(cp->fw_data);
5178 5178
5179 mutex_lock(&cp->pm_mutex); 5179 mutex_lock(&cp->pm_mutex);
5180 flush_scheduled_work(); 5180 cancel_work_sync(&cp->reset_task);
5181 if (cp->hw_running) 5181 if (cp->hw_running)
5182 cas_shutdown(cp); 5182 cas_shutdown(cp);
5183 mutex_unlock(&cp->pm_mutex); 5183 mutex_unlock(&cp->pm_mutex);