From: Gabor Juhos Date: Tue, 25 Jun 2013 20:57:29 +0000 (+0200) Subject: rt2x00: rt2800lib: fix default TX power check for RT55xx X-Git-Tag: v3.11-rc1~64^2~78^2^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0847beb2865f5ef1c8626ec1a37def18f3d6c41a;p=profile%2Fivi%2Fkernel-x86-ivi.git 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 Cc: stable@vger.kernel.org # 3.10 Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 25f7dbee281..1f80ea5e29d 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);