b43: N-PHY: fix controling RF override

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

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 38cf37d..b8525cc 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -167,7 +167,7 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,
                                b43_phy_mask(dev, val_addr,
                                                ~(rf_ctrl->val_mask));
                        } else {
-                               if (core == 0 || ((1 << core) & i) != 0) {
+                               if (core == 0 || ((1 << i) & core)) {
                                        b43_phy_set(dev, en_addr, field);
                                        b43_phy_maskset(dev, val_addr,
                                                ~(rf_ctrl->val_mask),
@@ -200,7 +200,7 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,
                        addr = B43_PHY_N((i == 0) ?
                                rf_ctrl->addr0 : rf_ctrl->addr1);
 
-                       if ((core & (1 << i)) != 0)
+                       if ((1 << i) & core)
                                b43_phy_maskset(dev, addr, ~(rf_ctrl->bmask),
                                                (value << rf_ctrl->shift));