b43: N-PHY: fix code path on PHY init

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index f26b60b95dba..905f1d7bac20 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3498,19 +3498,16 @@ int b43_phy_initn(struct b43_wldev *dev)
                                         /* TODO N PHY Pre Calibrate TX Gain */
                                         target = b43_nphy_get_tx_gains(dev);
                                 }
-                        }
+                                if (!b43_nphy_cal_tx_iq_lo(dev, target, true, false))
+                                        if (b43_nphy_cal_rx_iq(dev, target, 2, 0) == 0)
+                                                b43_nphy_save_cal(dev);
+                        } else if (nphy->mphase_cal_phase_id == 0)
+                                ;/* N PHY Periodic Calibration with arg 3 */
+                } else {
+                        b43_nphy_restore_cal(dev);
                 }
         }
 
-        if (!b43_nphy_cal_tx_iq_lo(dev, target, true, false)) {
-                if (b43_nphy_cal_rx_iq(dev, target, 2, 0) == 0)
-                        b43_nphy_save_cal(dev);
-                else if (nphy->mphase_cal_phase_id == 0)
-                        ;/* N PHY Periodic Calibration with argument 3 */
-        } else {
-                b43_nphy_restore_cal(dev);
-        }
-
         b43_nphy_tx_pwr_ctrl_coef_setup(dev);
         b43_nphy_tx_power_ctrl(dev, tx_pwr_state);
         b43_phy_write(dev, B43_NPHY_TXMACIF_HOLDOFF, 0x0015);