commit 9c1f992c777d350b8c3b3e5c524decc131bcda28
author Rafał Miłecki <zajec5@gmail.com> Mon Feb 21 19:38:58 2011 +0100
committer John W. Linville <linville@tuxdriver.com> Wed Feb 23 16:25:29 2011 -0500
tree 69ae88120d518d04b80dd621136f6a026648ec4d
parent 512c044a299f133c8dc86dd5fa6378d745489286

b43: N-PHY: fix 0x2055 radio workaround condition

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

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index ab81ed8..00377b6 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -430,9 +430,9 @@
 	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);