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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

David Woodhouse and committed by

John W. Linville 20 years ago 178e0cc5 869aaab1

+1 -1

1 changed file

expand all

drivers

net

wireless

bcm43xx

bcm43xx_phy.c

+1 -1

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

··· 1287 1287 if (radio->revision == 8) 1288 1288 bcm43xx_phy_write(bcm, 0x0805, 0x3230); 1289 1289 bcm43xx_phy_init_pctl(bcm); 1290 - if (bcm->chip_id == 0x4306 && bcm->chip_package != 2) { 1290 + if (bcm->chip_id == 0x4306 && bcm->chip_package == 2) { 1291 1291 bcm43xx_phy_write(bcm, 0x0429, 1292 1292 bcm43xx_phy_read(bcm, 0x0429) & 0xBFFF); 1293 1293 bcm43xx_phy_write(bcm, 0x04C3,