diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 16:01:20 -0700 |
---|---|---|
committer | Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 16:01:20 -0700 |
commit | 23aee82e75c1ced9492cbff6090b8e213d95945e (patch) | |
tree | 2d8f0f7fc59a65bffc852c7dc167ee6b196c07a7 /drivers/net/wireless/bcm43xx/bcm43xx_phy.c | |
parent | spidernet: enable support for bcm5461 ethernet phy (diff) | |
parent | [PATCH] bcm43xx: Fix access to non-existent PHY registers (diff) | |
download | linux-dev-23aee82e75c1ced9492cbff6090b8e213d95945e.tar.xz linux-dev-23aee82e75c1ced9492cbff6090b8e213d95945e.zip |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_phy.c')
-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, |