b43: LP-PHY: Fix setting TX power control mode during RC calibration

[pandora-kernel.git] / drivers / net / wireless / b43 / phy_lp.c

diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index faca56f..9402383 100644 (file)
--- 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;
 
@@ -1159,7 +1159,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)
        lpphy_read_tx_pctl_mode_from_hardware(dev);
        old_txpctl = lpphy->txpctl_mode;
 
-       lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
+       lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
        lpphy_disable_crs(dev);
        loopback = lpphy_loopback(dev);
        if (loopback == -1)