summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGábor Stefanik <netrolller.3d@gmail.com>2009-08-14 22:29:47 +0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 19:35:59 +0400
commit12d4bba0fd7ac50ca20d9ac1247a0de851850bb0 (patch)
treefdcaed678298fe69ffe8e70b50a121d61070d0e8
parent1de6f73c34fb9a74454a5b519cefd635b5e8ceb6 (diff)
downloadlinux-12d4bba0fd7ac50ca20d9ac1247a0de851850bb0.tar.xz
b43: LP-PHY: Fix reading old mode in the set TX power control routine
Check the mode the hardware is in, not the mode we used the last time. Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/phy_lp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index faca56f908ef..ca52fd5f38ce 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -1085,9 +1085,9 @@ static void lpphy_set_tx_power_control(struct b43_wldev *dev,
struct b43_phy_lp *lpphy = dev->phy.lp;
enum b43_lpphy_txpctl_mode oldmode;
- oldmode = lpphy->txpctl_mode;
lpphy_read_tx_pctl_mode_from_hardware(dev);
- if (lpphy->txpctl_mode == mode)
+ oldmode = lpphy->txpctl_mode;
+ if (oldmode == mode)
return;
lpphy->txpctl_mode = mode;