diff options
| author | Philipp Dreimann | 2011-12-07 20:43:31 +0100 |
|---|---|---|
| committer | John W. Linville | 2011-12-07 21:09:54 +0100 |
| commit | 91ddff8a3b9cc7ac2252aca138220939cf6cc2cf (patch) | |
| tree | 9b8b6bf8a3ceb59ef4514f9e94d824b400640caa /drivers/net/wireless/rtlwifi/rtl8192de/phy.c | |
| parent | mac80211: fix another race in aggregation start (diff) | |
| download | kernel-qcow2-linux-91ddff8a3b9cc7ac2252aca138220939cf6cc2cf.tar.gz kernel-qcow2-linux-91ddff8a3b9cc7ac2252aca138220939cf6cc2cf.tar.xz kernel-qcow2-linux-91ddff8a3b9cc7ac2252aca138220939cf6cc2cf.zip | |
rtl8192{ce,cu,de,se}: avoid problems because of possible ERFOFF -> ERFSLEEP transition
In drivers rtl8192ce, rtl8192cu, rtl8192se, and rtl8192de, break
statements would allow ppsc->rfpwr_state to be changed to ERFSLEEP
even though the device is actually in ERFOFF.
Signed-off-by: Philipp Dreimann <philipp@dreimann.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Cc: Chaoming Li <chaoming_li@realsil.com.cn>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192de/phy.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c index 3ac7af1c5509..0883349e1c83 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c @@ -3374,7 +3374,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw, break; case ERFSLEEP: if (ppsc->rfpwr_state == ERFOFF) - break; + return false; for (queue_id = 0, i = 0; queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) { |