Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03f665c8 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

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



The order is different than on older PHYs.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent daadc6b3

drivers/net/wireless/b43/tables_nphy.c

+6 −6
Original line number Diff line number Diff line
@@ -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: