openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath10k: clean up start() callback 

This fixes failpath when override AC pdev param
setup fails and makes other pdev params setting
fail as well.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Michal Kazior 2014-05-26 12:46:02 +03:00 committed by Kalle Valo
parent 6782cb696d
commit ae254433a8
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/wireless/ath/ath10k/mac.c
View File

@ -2404,22 +2404,19 @@ static int ath10k_start(struct ieee80211_hw *hw)
if (ar->state != ATH10K_STATE_OFF && if (ar->state != ATH10K_STATE_OFF &&
ar->state != ATH10K_STATE_RESTARTING) { ar->state != ATH10K_STATE_RESTARTING) {
ret = -EINVAL; ret = -EINVAL;
goto exit; goto err;
} }
ret = ath10k_hif_power_up(ar); ret = ath10k_hif_power_up(ar);
if (ret) { if (ret) {
ath10k_err("Could not init hif: %d\n", ret); ath10k_err("Could not init hif: %d\n", ret);
ar->state = ATH10K_STATE_OFF; goto err_off;
goto exit;
} }
ret = ath10k_core_start(ar); ret = ath10k_core_start(ar);
if (ret) { if (ret) {
ath10k_err("Could not init core: %d\n", ret); ath10k_err("Could not init core: %d\n", ret);
ath10k_hif_power_down(ar); goto err_power_down;
ar->state = ATH10K_STATE_OFF;
goto exit;
} }
if (ar->state == ATH10K_STATE_OFF) if (ar->state == ATH10K_STATE_OFF)
@ -2428,12 +2425,16 @@ static int ath10k_start(struct ieee80211_hw *hw)
ar->state = ATH10K_STATE_RESTARTED; ar->state = ATH10K_STATE_RESTARTED;
ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->pmf_qos, 1); ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->pmf_qos, 1);
if (ret) if (ret) {
ath10k_warn("failed to enable PMF QOS: %d\n", ret); ath10k_warn("failed to enable PMF QOS: %d\n", ret);
goto err_core_stop;
}
ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->dynamic_bw, 1); ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->dynamic_bw, 1);
if (ret) if (ret) {
ath10k_warn("failed to enable dynamic BW: %d\n", ret); ath10k_warn("failed to enable dynamic BW: %d\n", ret);
goto err_core_stop;
}
if (ar->cfg_tx_chainmask) if (ar->cfg_tx_chainmask)
__ath10k_set_antenna(ar, ar->cfg_tx_chainmask, __ath10k_set_antenna(ar, ar->cfg_tx_chainmask,
@ -2453,14 +2454,25 @@ static int ath10k_start(struct ieee80211_hw *hw)
if (ret) { if (ret) {
ath10k_warn("failed to set arp ac override parameter: %d\n", ath10k_warn("failed to set arp ac override parameter: %d\n",
ret); ret);
goto exit; goto err_core_stop;
} }
ar->num_started_vdevs = 0; ar->num_started_vdevs = 0;
ath10k_regd_update(ar); ath10k_regd_update(ar);
ret = 0;
exit: mutex_unlock(&ar->conf_mutex);
return 0;
err_core_stop:
ath10k_core_stop(ar);
err_power_down:
ath10k_hif_power_down(ar);
err_off:
ar->state = ATH10K_STATE_OFF;
err:
mutex_unlock(&ar->conf_mutex); mutex_unlock(&ar->conf_mutex);
return ret; return ret;
} }