lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k_htc: Fix locking for ps_idle

Browse Source 
ps_idle is protected by the htc_pm_lock mutex.
Use it to protect the variable.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith
2010-06-01 15:14:16 +05:30
committed by John W. Linville
parent 3901737e25
commit 23367769af
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/ath9k/htc_drv_main.c
View File

@@ -1401,16 +1401,17 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
bool enable_radio = false; bool enable_radio = false;
bool idle = !!(conf->flags & IEEE80211_CONF_IDLE); bool idle = !!(conf->flags & IEEE80211_CONF_IDLE);
mutex_lock(&priv->htc_pm_lock);
if (!idle && priv->ps_idle) if (!idle && priv->ps_idle)
enable_radio = true; enable_radio = true;
priv->ps_idle = idle; priv->ps_idle = idle;
mutex_unlock(&priv->htc_pm_lock);
if (enable_radio) { if (enable_radio) {
ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);
ath9k_htc_radio_enable(hw);
ath_print(common, ATH_DBG_CONFIG, ath_print(common, ATH_DBG_CONFIG,
"not-idle: enabling radio\n"); "not-idle: enabling radio\n");
ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);
ath9k_htc_radio_enable(hw);
} }
} }
@@ -1453,14 +1454,21 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
} }
} }
if ((changed & IEEE80211_CONF_CHANGE_IDLE) && priv->ps_idle) { if (changed & IEEE80211_CONF_CHANGE_IDLE) {
mutex_lock(&priv->htc_pm_lock);
if (!priv->ps_idle) {
mutex_unlock(&priv->htc_pm_lock);
goto out;
}
mutex_unlock(&priv->htc_pm_lock);
ath_print(common, ATH_DBG_CONFIG, ath_print(common, ATH_DBG_CONFIG,
"idle: disabling radio\n"); "idle: disabling radio\n");
ath9k_htc_radio_disable(hw); ath9k_htc_radio_disable(hw);
} }
out:
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
return 0; return 0;
} }