Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10d0b903 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192cu: Fix duplicate if test 



A typo causes routine rtl92cu_phy_rf6052_set_cck_txpower() to test the
same condition twice. The problem was found using cppcheck-1.49, and the
proper fix was verified against the pre-mac80211 version of the code.

This patch was originally included as commit 1288aa4e, but was accidentally
reverted in a later patch.

Reported-by: David Binderman <dcb314@hotmail.com> [original report]
Reported-by: Andrea Morello <andrea.merello@gmail.com> [report of accidental reversion]
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: stable <stable@vger.kernel.org>  [back to 2.6.39]
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 354b75bf

drivers/net/wireless/rtlwifi/rtl8192cu/rf.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, 
			tx_agc[RF90_PATH_A] = 0x10101010;

			tx_agc[RF90_PATH_B] = 0x10101010;

		} else if (rtlpriv->dm.dynamic_txhighpower_lvl ==

			   TXHIGHPWRLEVEL_LEVEL1) {

			   TXHIGHPWRLEVEL_LEVEL2) {

			tx_agc[RF90_PATH_A] = 0x00000000;

			tx_agc[RF90_PATH_B] = 0x00000000;

		} else{