summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2010-10-22 17:43:48 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-11-15 13:24:34 -0500
commit7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b (patch)
treebf5803c1363874a0ac1a0e86465caad3456e1cdf /drivers/net/wireless/b43
parent7e6da2bfc05c2b96197c12484f3d071fe0c6d0fb (diff)
downloadlinux-stable-7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b.tar.gz
linux-stable-7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b.tar.bz2
linux-stable-7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b.zip
b43: N-PHY: determine usage of radio regulatory workaround correctly
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index e0f2d122e124..c22dbfb987de 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -191,7 +191,8 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
binfo->type != 0x46D ||
binfo->rev < 0x41);
else
- workaround = ((sprom->boardflags_hi & B43_BFH_NOPA) == 0);
+ workaround =
+ !(sprom->boardflags2_lo & B43_BFL2_RXBB_INT_REG_DIS);
b43_radio_mask(dev, B2055_MASTER1, 0xFFF3);
if (workaround) {