1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index ac510840519c..8d7fa59364fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -508,6 +508,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
         struct iwl_priv *priv =
             container_of(work, struct iwl_priv, scan_completed);
         bool internal = false;
+        bool scan_completed = false;
 
         IWL_DEBUG_SCAN(priv, "SCAN complete scan\n");
 
@@ -518,7 +519,8 @@ static void iwl_bg_scan_completed(struct work_struct *work)
                 priv->is_internal_short_scan = false;
                 IWL_DEBUG_SCAN(priv, "internal short scan completed\n");
                 internal = true;
-        } else {
+        } else if (priv->scan_request) {
+                scan_completed = true;
                 priv->scan_request = NULL;
                 priv->scan_vif = NULL;
         }
@@ -549,7 +551,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
          * into driver again into functions that will attempt to take
          * mutex.
          */
-        if (!internal)
+        if (scan_completed)
                 ieee80211_scan_completed(priv->hw, false);
 }