diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2011-12-12 21:38:35 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-12-13 15:47:44 -0500 |
| commit | 03f665c895fa9801ef4701d3e4e0918055370ee2 (patch) | |
| tree | 665b1dd921e566acd6f0b5257ed934cbd7ef7fa7 /drivers/net/wireless/b43/tables_nphy.c | |
| parent | bcma: extract revision and TX power IDs from SPROM (diff) | |
| download | linux-dev-03f665c895fa9801ef4701d3e4e0918055370ee2.tar.xz linux-dev-03f665c895fa9801ef4701d3e4e0918055370ee2.zip | |
b43: N-PHY: fix 32-bit reads of tables
The order is different than on older PHYs.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/tables_nphy.c')
| -rw-r--r-- | drivers/net/wireless/b43/tables_nphy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c index 691839e7541c..e1fc337df84b 100644 --- a/drivers/net/wireless/b43/tables_nphy.c +++ b/drivers/net/wireless/b43/tables_nphy.c @@ -2880,9 +2880,8 @@ u32 b43_ntab_read(struct b43_wldev *dev, u32 offset) break; case B43_NTAB_32BIT: b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset); - value = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI); - value <<= 16; - value |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO); + value = b43_phy_read(dev, B43_NPHY_TABLE_DATALO); + value |= b43_phy_read(dev, B43_NPHY_TABLE_DATAHI) << 16; break; default: B43_WARN_ON(1); @@ -2916,9 +2915,10 @@ void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset, data += 2; break; case B43_NTAB_32BIT: - *((u32 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI); - *((u32 *)data) <<= 16; - *((u32 *)data) |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO); + *((u32 *)data) = + b43_phy_read(dev, B43_NPHY_TABLE_DATALO); + *((u32 *)data) |= + b43_phy_read(dev, B43_NPHY_TABLE_DATAHI) << 16; data += 4; break; default: |