From: Rafał Miłecki <zajec5@gmail.com>
Date: Mon, 21 Feb 2011 18:38:58 +0000 (+0100)
Subject: b43: N-PHY: fix 0x2055 radio workaround condition
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c1f992c777d350b8c3b3e5c524decc131bcda28;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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>
---

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index ab81ed8b19d7..00377b687384 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -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);