Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / drivers / net / wireless / b43 / phy_g.c

diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c
index 29bf34ced86552cb35ec284cf45d297c2f0479f7..0dc33b65e86be53a3de7f3642b8793ab06c9ef9a 100644 (file)
--- a/drivers/net/wireless/b43/phy_g.c
+++ b/drivers/net/wireless/b43/phy_g.c
@@ -972,7 +972,7 @@ b43_radio_interference_mitigation_enable(struct b43_wldev *dev, int mode)
                b43_phy_maskset(dev, 0x04A2, 0xFFF0, 0x000B);
 
                if (phy->rev >= 3) {
-                       b43_phy_mask(dev, 0x048A, (u16)~0x8000);
+                       b43_phy_mask(dev, 0x048A, 0x7FFF);
                        b43_phy_maskset(dev, 0x0415, 0x8000, 0x36D8);
                        b43_phy_maskset(dev, 0x0416, 0x8000, 0x36D8);
                        b43_phy_maskset(dev, 0x0417, 0xFE00, 0x016D);