aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 65b7cb4290cb..599573f2b01f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -573,7 +573,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
573 573
574 if (!test_and_clear_bit(STATUS_SCANNING, &priv->status)) { 574 if (!test_and_clear_bit(STATUS_SCANNING, &priv->status)) {
575 IWL_DEBUG_SCAN(priv, "Scan already completed.\n"); 575 IWL_DEBUG_SCAN(priv, "Scan already completed.\n");
576 goto out; 576 goto out_settings;
577 } 577 }
578 578
579 if (priv->is_internal_short_scan && !aborted) { 579 if (priv->is_internal_short_scan && !aborted) {
@@ -599,6 +599,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
599out_complete: 599out_complete:
600 iwl_complete_scan(priv, aborted); 600 iwl_complete_scan(priv, aborted);
601 601
602out_settings:
602 /* Can we still talk to firmware ? */ 603 /* Can we still talk to firmware ? */
603 if (!iwl_is_ready_rf(priv)) 604 if (!iwl_is_ready_rf(priv))
604 goto out; 605 goto out;