aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
diff options
context:
space:
mode:
authorMichael Buesch <mbuesch@freenet.de>2006-03-15 18:13:53 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-03-27 11:19:39 -0500
commit5808bbbdf8c095745f0cac9110b245102243b243 (patch)
tree1c74ae35e06d8a7cec0ec6109e8faee3b4191b60 /drivers/net/wireless/bcm43xx/bcm43xx_radio.c
parentb3db5e553876c1743eefae5963aea431ec4d5ba6 (diff)
downloadlinux-stericsson-5808bbbdf8c095745f0cac9110b245102243b243.tar.gz
[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>
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_radio.c')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_radio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index 07a6169a0b34..cac604bc0955 100644
--- 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);