1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index e9d9d622a9b0..a8bddd81b4d1 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2621,7 +2621,7 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
         iface = netdev_priv(dev);
         local = iface->local;
 
-        /* Detect early interrupt before driver is fully configued */
+        /* Detect early interrupt before driver is fully configured */
         spin_lock(&local->irq_init_lock);
         if (!dev->base_addr) {
                 if (net_ratelimit()) {
@@ -3317,7 +3317,13 @@ static void prism2_free_local_data(struct net_device *dev)
 
         unregister_netdev(local->dev);
 
-        flush_scheduled_work();
+        flush_work_sync(&local->reset_queue);
+        flush_work_sync(&local->set_multicast_list_queue);
+        flush_work_sync(&local->set_tim_queue);
+#ifndef PRISM2_NO_STATION_MODES
+        flush_work_sync(&local->info_queue);
+#endif
+        flush_work_sync(&local->comms_qual_update);
 
         lib80211_crypt_info_free(&local->crypt_info);