---

yaml --- r: 314217 b: refs/heads/master c: 76a3aa8 h: refs/heads/master i: 314215: d932867 v: v3
git-mirror · Jun 6, 2012 · 676356c · 676356c
1 parent 6a2538b
commit 676356c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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) {