From: Ilan Peer <ilan.peer@intel.com>
Date: Thu, 17 May 2012 09:42:59 +0000 (+0300)
Subject: iwlwifi: clear STATUS_SCAN_HW when PAN_PARAMS fails
X-Git-Tag: v3.6-rc1~125^2~57^2~354
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76a3aa89937cf0b9a560e4c778e54e993018da60;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

iwlwifi: clear STATUS_SCAN_HW when PAN_PARAMS fails

The STATUS_SCAN_HW is set before calling iwlagn_set_pan_params
(used as an input to calculate slot time allocation). The bit needs
to be cleared in case sending the command fails.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 069849e..a32b35e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/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) {