diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2011-12-22 00:47:18 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-04 20:30:42 +0100 |
| commit | b97c071840ccc2c8016de87c21a95c9286415448 (patch) | |
| tree | a1d4759cfe2c3ad840ec28a010d89a75db7709a2 /drivers/net/wireless/b43 | |
| parent | b43: N-PHY: update gain ctl workarounds (diff) | |
| download | linux-b97c071840ccc2c8016de87c21a95c9286415448.tar.xz linux-b97c071840ccc2c8016de87c21a95c9286415448.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index 38cf37d41ff5..b8525cca410e 100644 --- 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)); |