From b71afa7ef015e1bee44c52b62123beea402b1a52 Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Mon, 14 Jun 2010 22:11:32 +0200
Subject: [PATCH] --- yaml --- r: 203063 b: refs/heads/master c:
 a3f84ca4b8dc31d0034a8b23194a4470766c938c h: refs/heads/master i:   203061:
 f4a8fc549e63c580b3124446e9eaf191288e2884   203059:
 64fd681be7f077640dc94919ebe56892a4f703c8   203055:
 9007dcc27a132f601791e6e2bbdb954be0f09933 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bac0ff92dc9a..e7f6026a47de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3afa626a05a1d9fceedb397a66e85c13e3ff2c26
+refs/heads/master: a3f84ca4b8dc31d0034a8b23194a4470766c938c
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
index ae20e6728b1e..f15832245e0e 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1079,7 +1079,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
 	u8 r1;
 
 	rt2800_bbp_read(rt2x00dev, 1, &r1);
-	rt2x00_set_field8(&reg, BBP1_TX_POWER, 0);
+	rt2x00_set_field8(&r1, BBP1_TX_POWER, 0);
 	rt2800_bbp_write(rt2x00dev, 1, r1);
 
 	rt2800_register_read(rt2x00dev, TX_PWR_CFG_0, &reg);