Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5808bbbd authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

[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: default avatarMichael Buesch <mbuesch@freenet.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b3db5e55

drivers/net/wireless/bcm43xx/bcm43xx_radio.c

+2 −2
Original line number Diff line number Diff line
@@ -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);