summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2800lib.c
diff options
context:
space:
mode:
authorGabor Juhos2013-06-25 22:57:29 +0200
committerJohn W. Linville2013-06-27 19:42:13 +0200
commit0847beb2865f5ef1c8626ec1a37def18f3d6c41a (patch)
tree41255cbf1b8adaeeff47238f89f40dc0aee84a86 /drivers/net/wireless/rt2x00/rt2800lib.c
parentath9k: Add mix tx gain table for AR9462 2.0 (diff)
downloadkernel-qcow2-linux-0847beb2865f5ef1c8626ec1a37def18f3d6c41a.tar.gz
kernel-qcow2-linux-0847beb2865f5ef1c8626ec1a37def18f3d6c41a.tar.xz
kernel-qcow2-linux-0847beb2865f5ef1c8626ec1a37def18f3d6c41a.zip
rt2x00: rt2800lib: fix default TX power check for RT55xx
The code writes the default_power2 value into the TX field of the RFCSR50 register, however the condition in the if statement uses default_power1. Due to this, wrong TX power value might be written into the register. Use the correct value in the condition to fix the issue. Compile tested only. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Cc: stable@vger.kernel.org # 3.10 Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 25f7dbee2811..1f80ea5e29dd 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2392,7 +2392,7 @@ static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev,
rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);
- if (info->default_power1 > power_bound)
+ if (info->default_power2 > power_bound)
rt2x00_set_field8(&rfcsr, RFCSR50_TX, power_bound);
else
rt2x00_set_field8(&rfcsr, RFCSR50_TX, info->default_power2);