1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/ar9170/main.c b/drivers/net/wireless/ar9170/main.c
index 5996ff9f7f47..5f55754d968f 100644
--- a/drivers/net/wireless/ar9170/main.c
+++ b/drivers/net/wireless/ar9170/main.c
@@ -742,8 +742,9 @@ static void ar9170_op_stop(struct ieee80211_hw *hw)
         if (IS_STARTED(ar))
                 ar->state = AR9170_IDLE;
 
-        mutex_lock(&ar->mutex);
+        flush_workqueue(ar->hw->workqueue);
 
+        mutex_lock(&ar->mutex);
         cancel_delayed_work_sync(&ar->tx_status_janitor);
         cancel_work_sync(&ar->filter_config_work);
         cancel_work_sync(&ar->beacon_work);
@@ -1123,10 +1124,10 @@ static void ar9170_set_filters(struct work_struct *work)
                                          filter_config_work);
         int err;
 
-        mutex_lock(&ar->mutex);
         if (unlikely(!IS_STARTED(ar)))
-                goto unlock;
+                return ;
 
+        mutex_lock(&ar->mutex);
         if (ar->filter_changed & AR9170_FILTER_CHANGED_PROMISC) {
                 err = ar9170_set_operating_mode(ar);
                 if (err)