Commit 0530bd4a authored by Gabor Juhos's avatar Gabor Juhos Committed by Greg Kroah-Hartman

rt2x00: rt2800lib: fix default TX power check for RT55xx

commit 0847beb2 upstream.

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: default avatarGabor Juhos <juhosg@openwrt.org>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24e095cd
...@@ -2392,7 +2392,7 @@ static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev, ...@@ -2392,7 +2392,7 @@ static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev,
rt2800_rfcsr_write(rt2x00dev, 49, rfcsr); rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
rt2800_rfcsr_read(rt2x00dev, 50, &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); rt2x00_set_field8(&rfcsr, RFCSR50_TX, power_bound);
else else
rt2x00_set_field8(&rfcsr, RFCSR50_TX, info->default_power2); rt2x00_set_field8(&rfcsr, RFCSR50_TX, info->default_power2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment