Commit 478fdf2b authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville

wl1251: fix error handling in wl1251_op_config()

Not all return values were checked and one exit from function didn't put
firmware sleep after the error.
Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d67e2618
...@@ -645,20 +645,25 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) ...@@ -645,20 +645,25 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
* through the bss_info_changed() hook. * through the bss_info_changed() hook.
*/ */
ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE); ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
if (ret < 0)
goto out_sleep;
} else if (!(conf->flags & IEEE80211_CONF_PS) && } else if (!(conf->flags & IEEE80211_CONF_PS) &&
wl->psm_requested) { wl->psm_requested) {
wl1251_debug(DEBUG_PSM, "psm disabled"); wl1251_debug(DEBUG_PSM, "psm disabled");
wl->psm_requested = false; wl->psm_requested = false;
if (wl->psm) if (wl->psm) {
ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE); ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE);
if (ret < 0)
goto out_sleep;
}
} }
if (conf->power_level != wl->power_level) { if (conf->power_level != wl->power_level) {
ret = wl1251_acx_tx_power(wl, conf->power_level); ret = wl1251_acx_tx_power(wl, conf->power_level);
if (ret < 0) if (ret < 0)
goto out; goto out_sleep;
wl->power_level = conf->power_level; wl->power_level = conf->power_level;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment