b43: N-PHY: fix 0x2055 radio workaround condition
authorRafał Miłecki <zajec5@gmail.com>
Mon, 21 Feb 2011 18:38:58 +0000 (19:38 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Feb 2011 21:25:29 +0000 (16:25 -0500)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/phy_n.c

index ab81ed8b19d7e9030327123b5417be4d6ae10f9c..00377b687384d3c353f4cadf2a8718f2cbd3f632 100644 (file)
@@ -430,9 +430,9 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
        bool workaround = false;
 
        if (sprom->revision < 4)
-               workaround = (binfo->vendor != PCI_VENDOR_ID_BROADCOM ||
-                               binfo->type != 0x46D ||
-                               binfo->rev < 0x41);
+               workaround = (binfo->vendor != PCI_VENDOR_ID_BROADCOM &&
+                               binfo->type == 0x46D &&
+                               binfo->rev >= 0x41);
        else
                workaround =
                        !(sprom->boardflags2_lo & B43_BFL2_RXBB_INT_REG_DIS);