From 676356c68662a81ec905d2cc753618f16fd39555 Mon Sep 17 00:00:00 2001
From: Ilan Peer <ilan.peer@intel.com>
Date: Thu, 17 May 2012 12:42:59 +0300
Subject: [PATCH] --- yaml --- r: 314217 b: refs/heads/master c:
 76a3aa89937cf0b9a560e4c778e54e993018da60 h: refs/heads/master i:   314215:
 d9328674575cc4da595d5b7f12902c2b00822240 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 75bd67e63e6a..8fff24b171bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53e1116ebd3c0bab4d6daf0da4492f813b778cf8
+refs/heads/master: 76a3aa89937cf0b9a560e4c778e54e993018da60
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
index 069849e66234..a32b35ea9e60 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -966,8 +966,10 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	set_bit(STATUS_SCAN_HW, &priv->status);
 
 	ret = iwlagn_set_pan_params(priv);
-	if (ret)
+	if (ret) {
+		clear_bit(STATUS_SCAN_HW, &priv->status);
 		return ret;
+	}
 
 	ret = iwl_dvm_send_cmd(priv, &cmd);
 	if (ret) {