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

Commit 68fa64ef authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Fix efuse EEPROM reading on PPC32. 



Fix __le32 to __le16 conversion of the first word of an 8-word block
of EEPROM read via the efuse method.

Reported-and-tested-by: default avatarIngvar Hagelund <ingvar@redpill-linpro.com>
Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
CC: <stable@vger.kernel.org>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 23085d57

drivers/net/wireless/rt2x00/rt2800lib.c

+1 −1
Original line number Diff line number Diff line
@@ -3771,7 +3771,7 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i) 
	/* Apparently the data is read from end to start */

	rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, &reg);

	/* The returned value is in CPU order, but eeprom is le */

	rt2x00dev->eeprom[i] = cpu_to_le32(reg);

	*(u32 *)&rt2x00dev->eeprom[i] = cpu_to_le32(reg);

	rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, &reg);

	*(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg);

	rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, &reg);