From d68f18912c3764d58cd6a7b0230955a9219f80b5 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Fri, 5 Oct 2012 13:44:10 +0200 Subject: [PATCH] --- yaml --- r: 340905 b: refs/heads/master c: 19f3fa248174b2611d47229db847427092c1849f h: refs/heads/master i: 340903: 7f5b45718c34d0ff76a58fae24cb9630c6e88af3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 378ace721597..f1a9c4e59ce9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cee2c7315f60beeff6137ee59e99acc77d636eeb +refs/heads/master: 19f3fa248174b2611d47229db847427092c1849f diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c index 934dd9d9d4dc..6bbd60243dc4 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c @@ -2563,7 +2563,8 @@ static u8 rt2800_compensate_txpower(struct rt2x00_dev *rt2x00dev, int is_rate_b, } else reg_limit = 0; - return txpower + delta - reg_limit; + txpower = max(0, txpower + delta - reg_limit); + return min_t(u8, txpower, 0xc); } static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,