---

yaml --- r: 340905 b: refs/heads/master c: 19f3fa2 h: refs/heads/master i: 340903: 7f5b457 v: v3
git-mirror · Oct 19, 2012 · d68f189 · d68f189
1 parent d33f01d
commit d68f189
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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,