mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-18 10:34:24 +08:00
[PATCH] w1: fix CRC calculation on bigendian platforms.
In the 2.6.13-rc1 code the "rn" structure is in the wrong-endianness when passed to w1_attach_slave_device(). This causes problems like the family and crc being swapped around. Signed-off-by: Roger Blofeld <blofeldus@yahoo.com> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
80efa8c720
commit
0e65f82814
@ -516,6 +516,7 @@ static void w1_slave_found(unsigned long data, u64 rn)
|
||||
struct w1_reg_num *tmp;
|
||||
int family_found = 0;
|
||||
struct w1_master *dev;
|
||||
u64 rn_le = cpu_to_le64(rn);
|
||||
|
||||
dev = w1_search_master(data);
|
||||
if (!dev) {
|
||||
@ -544,10 +545,8 @@ static void w1_slave_found(unsigned long data, u64 rn)
|
||||
slave_count++;
|
||||
}
|
||||
|
||||
rn = cpu_to_le64(rn);
|
||||
|
||||
if (slave_count == dev->slave_count &&
|
||||
rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) {
|
||||
rn && ((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn_le, 7)) {
|
||||
w1_attach_slave_device(dev, tmp);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user