From 75b1c0c1f76c0f5ed6d316592d8a33f0c09fb11d Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Sun, 13 Jan 2008 14:12:44 +0100
Subject: [PATCH] --- yaml --- r: 79413 b: refs/heads/master c:
 243dcfcc1d4b33aa610f1bf3ec610dafdf4d7ff7 h: refs/heads/master i:   79411:
 9a534b9e43fe73df0b316833c51272f94a0b0e4e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/main.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 59d5670b49be..bc198d871878 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89539ebe2f2eb3a0d77b92884b092f2eb2575bd9
+refs/heads/master: 243dcfcc1d4b33aa610f1bf3ec610dafdf4d7ff7
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 257640a921a3..481bc8238e7c 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -3139,10 +3139,9 @@ static int b43_phy_versioning(struct b43_wldev *dev)
 			tmp = 0x5205017F;
 	} else {
 		b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID);
-		tmp = b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH);
-		tmp <<= 16;
+		tmp = b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
 		b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID);
-		tmp |= b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
+		tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH) << 16;
 	}
 	radio_manuf = (tmp & 0x00000FFF);
 	radio_ver = (tmp & 0x0FFFF000) >> 12;
@@ -3167,7 +3166,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
 			unsupported = 1;
 		break;
 	case B43_PHYTYPE_N:
-		if (radio_ver != 5)
+		if (radio_ver != 0x2055)
 			unsupported = 1;
 		break;
 	default: