| From 10d0b9030a3f86e1e26c710c7580524d7787d688 Mon Sep 17 00:00:00 2001 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| Date: Tue, 18 Jun 2013 13:25:05 -0500 |
| Subject: rtlwifi: rtl8192cu: Fix duplicate if test |
| |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| |
| commit 10d0b9030a3f86e1e26c710c7580524d7787d688 upstream. |
| |
| 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 1288aa4, 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: Larry Finger <Larry.Finger@lwfinger.net> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c |
| +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c |
| @@ -104,7 +104,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower( |
| 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{ |