diff options
author | Michael Buesch <mb@bu3sch.de> | 2008-01-13 08:12:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:09:49 -0500 |
commit | 243dcfcc1d4b33aa610f1bf3ec610dafdf4d7ff7 (patch) | |
tree | 77893fc70e26e4da1f68762dd9e68e11d59301fa /drivers/net | |
parent | 89539ebe2f2eb3a0d77b92884b092f2eb2575bd9 (diff) |
b43: Fix radio ID register reading
This fixes reading of the high 16 bits of the radio ID
on new devices. 2055 radios want lo16 to be read first.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 257640a921a3..481bc8238e7c 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -3139,10 +3139,9 @@ static int b43_phy_versioning(struct b43_wldev *dev) | |||
3139 | tmp = 0x5205017F; | 3139 | tmp = 0x5205017F; |
3140 | } else { | 3140 | } else { |
3141 | b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID); | 3141 | b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID); |
3142 | tmp = b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH); | 3142 | tmp = b43_read16(dev, B43_MMIO_RADIO_DATA_LOW); |
3143 | tmp <<= 16; | ||
3144 | b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID); | 3143 | b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID); |
3145 | tmp |= b43_read16(dev, B43_MMIO_RADIO_DATA_LOW); | 3144 | tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH) << 16; |
3146 | } | 3145 | } |
3147 | radio_manuf = (tmp & 0x00000FFF); | 3146 | radio_manuf = (tmp & 0x00000FFF); |
3148 | radio_ver = (tmp & 0x0FFFF000) >> 12; | 3147 | radio_ver = (tmp & 0x0FFFF000) >> 12; |
@@ -3167,7 +3166,7 @@ static int b43_phy_versioning(struct b43_wldev *dev) | |||
3167 | unsupported = 1; | 3166 | unsupported = 1; |
3168 | break; | 3167 | break; |
3169 | case B43_PHYTYPE_N: | 3168 | case B43_PHYTYPE_N: |
3170 | if (radio_ver != 5) | 3169 | if (radio_ver != 0x2055) |
3171 | unsupported = 1; | 3170 | unsupported = 1; |
3172 | break; | 3171 | break; |
3173 | default: | 3172 | default: |