[PATCH] bcm43xx: Fix access to non-existent PHY registers
authorDavid Woodhouse <dwmw2@infradead.org>
Fri, 5 May 2006 17:19:37 +0000 (18:19 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:55:23 +0000 (16:55 -0400)
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>
drivers/net/wireless/bcm43xx/bcm43xx_phy.c

index 33137165727f7c69c054a9507324beda7fcd2830..b0abac5155300390791f441b891b2bd97f41525e 100644 (file)
@@ -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,