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

Commit 178e0cc5 authored by David Woodhouse's avatar David Woodhouse Committed by John W. Linville
Browse files

[PATCH] bcm43xx: Fix access to non-existent PHY registers 



Fix the conditions under which we poke at the APHY registers in
bcm43xx_phy_initg() to avoid a machine check on chips where they don't
exist.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 869aaab1

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm) 
	if (radio->revision == 8)

		bcm43xx_phy_write(bcm, 0x0805, 0x3230);

	bcm43xx_phy_init_pctl(bcm);

	if (bcm->chip_id == 0x4306 && bcm->chip_package != 2) {

	if (bcm->chip_id == 0x4306 && bcm->chip_package == 2) {

		bcm43xx_phy_write(bcm, 0x0429,

				  bcm43xx_phy_read(bcm, 0x0429) & 0xBFFF);

		bcm43xx_phy_write(bcm, 0x04C3,