[PATCH] bcm43xx: properly mask txctl1 before writing it to hardware.

This should not make a difference, but be careful to not trash the register.

Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index 07a6169a0b34ee7cc9d67a210971e834fff103ed..cac604bc09552c0a1a0281390ff66e87c5496131 100644 (file)
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -1690,8 +1690,8 @@ void bcm43xx_radio_set_txpower_bg(struct bcm43xx_private *bcm,
        bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0064, radio_attenuation);
        if (radio->version == 0x2050) {
                bcm43xx_radio_write16(bcm, 0x0052,
-                                     (bcm43xx_radio_read16(bcm, 0x0052) & 0xFF8F)
-                                      | (txpower << 4));
+                                     (bcm43xx_radio_read16(bcm, 0x0052) & ~0x0070)
+                                      | ((txpower << 4) & 0x0070));
        }
        if (phy->type == BCM43xx_PHYTYPE_G)
                bcm43xx_phy_lo_adjust(bcm, 0);