aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index ea83aa5bf29c..90d366e15d2f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1366,17 +1366,14 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
1366 /* set scan bit here for PAN params */ 1366 /* set scan bit here for PAN params */
1367 set_bit(STATUS_SCAN_HW, &priv->status); 1367 set_bit(STATUS_SCAN_HW, &priv->status);
1368 1368
1369 if (priv->cfg->ops->hcmd->set_pan_params) { 1369 ret = iwlagn_set_pan_params(priv);
1370 ret = priv->cfg->ops->hcmd->set_pan_params(priv); 1370 if (ret)
1371 if (ret) 1371 return ret;
1372 return ret;
1373 }
1374 1372
1375 ret = iwl_send_cmd_sync(priv, &cmd); 1373 ret = iwl_send_cmd_sync(priv, &cmd);
1376 if (ret) { 1374 if (ret) {
1377 clear_bit(STATUS_SCAN_HW, &priv->status); 1375 clear_bit(STATUS_SCAN_HW, &priv->status);
1378 if (priv->cfg->ops->hcmd->set_pan_params) 1376 iwlagn_set_pan_params(priv);
1379 priv->cfg->ops->hcmd->set_pan_params(priv);
1380 } 1377 }
1381 1378
1382 return ret; 1379 return ret;