From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Larry Finger <Larry.Finger@lwfinger.net>,
"John W. Linville" <linville@tuxdriver.com>
Subject: [ 03/24] rtlwifi: rtl8192cu: Fix duplicate if test
Date: Thu, 18 Jul 2013 19:24:35 -0700 [thread overview]
Message-ID: <20130719022404.249810033@linuxfoundation.org> (raw)
In-Reply-To: <20130719022404.015008451@linuxfoundation.org>
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
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{
next prev parent reply other threads:[~2013-07-19 2:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-19 2:24 [ 00/24] 3.4.54-stable review Greg Kroah-Hartman
2013-07-19 2:24 ` [ 01/24] CIFS use sensible file nlink values if unprovided Greg Kroah-Hartman
2013-07-19 2:24 ` [ 02/24] rtlwifi: rtl8192cu: Add new USB ID for TP-Link TL-WN8200ND Greg Kroah-Hartman
2013-07-19 2:24 ` Greg Kroah-Hartman [this message]
2013-07-19 2:24 ` [ 04/24] jbd2: fix theoretical race in jbd2__journal_restart Greg Kroah-Hartman
2013-07-19 2:24 ` [ 05/24] ext3,ext4: dont mess with dir_file->f_pos in htree_dirblock_to_tree() Greg Kroah-Hartman
2013-07-19 2:24 ` [ 06/24] USB: option,qcserial: move Novatel Gobi1K IDs to qcserial Greg Kroah-Hartman
2013-07-19 2:24 ` [ 07/24] usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed Greg Kroah-Hartman
2013-07-19 2:24 ` [ 08/24] xhci: check for failed dma pool allocation Greg Kroah-Hartman
2013-07-19 2:24 ` [ 09/24] usb: host: xhci-plat: release mem region while removing module Greg Kroah-Hartman
2013-07-19 2:24 ` [ 10/24] pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status Greg Kroah-Hartman
2013-07-19 2:24 ` [ 11/24] xen/time: remove blocked time accounting from xen "clockchip" Greg Kroah-Hartman
2013-07-19 2:24 ` [ 12/24] genirq: Fix can_request_irq() for IRQs without an action Greg Kroah-Hartman
2013-07-19 2:24 ` [ 13/24] drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq Greg Kroah-Hartman
2013-07-19 2:24 ` [ 14/24] ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan Greg Kroah-Hartman
2013-07-19 2:24 ` [ 15/24] ocfs2: xattr: fix inlined xattr reflink Greg Kroah-Hartman
2013-07-19 2:24 ` [ 16/24] ahci: Add AMD CZ SATA device ID Greg Kroah-Hartman
2013-07-19 2:24 ` [ 17/24] ahci: remove pmp link online check in FBS EH Greg Kroah-Hartman
2013-07-19 2:24 ` [ 18/24] timer: Fix jiffies wrap behavior of round_jiffies_common() Greg Kroah-Hartman
2013-07-19 2:24 ` [ 19/24] ext4: fix data offset overflow in ext4_xattr_fiemap() on 32-bit archs Greg Kroah-Hartman
2013-07-19 2:24 ` [ 20/24] ext4: fix overflow when counting used blocks on 32-bit architectures Greg Kroah-Hartman
2013-07-19 2:24 ` [ 21/24] ext4: dont allow ext4_free_blocks() to fail due to ENOMEM Greg Kroah-Hartman
2013-07-19 2:24 ` [ 22/24] ARM: 7765/1: perf: Record the user-mode PC in the call chain Greg Kroah-Hartman
2013-07-19 2:24 ` [ 23/24] drivers/dma/pl330.c: fix locking in pl330_free_chan_resources() Greg Kroah-Hartman
2013-07-19 2:24 ` [ 24/24] Handle big endianness in NTLM (ntlmv2) authentication Greg Kroah-Hartman
2013-07-19 23:19 ` [ 00/24] 3.4.54-stable review Shuah Khan
2013-07-19 23:19 ` Shuah Khan
2013-07-21 0:37 ` Satoru Takeuchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130719022404.249810033@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=Larry.Finger@lwfinger.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.