diff options
| author |   David Woodhouse <dwmw2@infradead.org> | 2006-05-05 18:19:37 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:55:23 -0400 |
| commit | 178e0cc5ff249965c6cfbd78b1af6a5e614d837c (patch) | |
| tree | dec46492578451461dc12777030138f44836412f | |
| parent | [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init (diff) | |
| download | linux-dev-178e0cc5ff249965c6cfbd78b1af6a5e614d837c.tar.xz linux-dev-178e0cc5ff249965c6cfbd78b1af6a5e614d837c.zip | |
[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: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c index 33137165727f..b0abac515530 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c @@ -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, |