aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/phy_n.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2011-12-21 18:47:18 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-04 14:30:42 -0500
commitb97c071840ccc2c8016de87c21a95c9286415448 (patch)
treea1d4759cfe2c3ad840ec28a010d89a75db7709a2 /drivers/net/wireless/b43/phy_n.c
parented5103edc217aea9e2018178971ad4ff0d40a9b0 (diff)
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/phy_n.c')
-rw-r--r--drivers/net/wireless/b43/phy_n.c4
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,
167 b43_phy_mask(dev, val_addr, 167 b43_phy_mask(dev, val_addr,
168 ~(rf_ctrl->val_mask)); 168 ~(rf_ctrl->val_mask));
169 } else { 169 } else {
170 if (core == 0 || ((1 << core) & i) != 0) { 170 if (core == 0 || ((1 << i) & core)) {
171 b43_phy_set(dev, en_addr, field); 171 b43_phy_set(dev, en_addr, field);
172 b43_phy_maskset(dev, val_addr, 172 b43_phy_maskset(dev, val_addr,
173 ~(rf_ctrl->val_mask), 173 ~(rf_ctrl->val_mask),
@@ -200,7 +200,7 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,
200 addr = B43_PHY_N((i == 0) ? 200 addr = B43_PHY_N((i == 0) ?
201 rf_ctrl->addr0 : rf_ctrl->addr1); 201 rf_ctrl->addr0 : rf_ctrl->addr1);
202 202
203 if ((core & (1 << i)) != 0) 203 if ((1 << i) & core)
204 b43_phy_maskset(dev, addr, ~(rf_ctrl->bmask), 204 b43_phy_maskset(dev, addr, ~(rf_ctrl->bmask),
205 (value << rf_ctrl->shift)); 205 (value << rf_ctrl->shift));
206 206