dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

b43: N-PHY: fix 32-bit reads of tables

Browse source 
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>
This commit is contained in:
Rafał Miłecki 2011-12-12 21:38:35 +01:00 committed by John W. Linville
parent daadc6b3bd
commit 03f665c895
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/wireless/b43/tables_nphy.c
View file

@ -2880,9 +2880,8 @@ u32 b43_ntab_read(struct b43_wldev *dev, u32 offset)
break; break;
case B43_NTAB_32BIT: case B43_NTAB_32BIT:
b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset); b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);
value = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI); value = b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
value <<= 16; value |= b43_phy_read(dev, B43_NPHY_TABLE_DATAHI) << 16;
value |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
break; break;
default: default:
B43_WARN_ON(1); B43_WARN_ON(1);
@ -2916,9 +2915,10 @@ void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,
data += 2; data += 2;
break; break;
case B43_NTAB_32BIT: case B43_NTAB_32BIT:
*((u32 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI); *((u32 *)data) =
*((u32 *)data) <<= 16; 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; data += 4;
break; break;
default: default: