Commit 0e65f828 authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman

[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: default avatarRoger Blofeld <blofeldus@yahoo.com>
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 80efa8c7
...@@ -516,6 +516,7 @@ static void w1_slave_found(unsigned long data, u64 rn) ...@@ -516,6 +516,7 @@ static void w1_slave_found(unsigned long data, u64 rn)
struct w1_reg_num *tmp; struct w1_reg_num *tmp;
int family_found = 0; int family_found = 0;
struct w1_master *dev; struct w1_master *dev;
u64 rn_le = cpu_to_le64(rn);
dev = w1_search_master(data); dev = w1_search_master(data);
if (!dev) { if (!dev) {
...@@ -544,10 +545,8 @@ static void w1_slave_found(unsigned long data, u64 rn) ...@@ -544,10 +545,8 @@ static void w1_slave_found(unsigned long data, u64 rn)
slave_count++; slave_count++;
} }
rn = cpu_to_le64(rn);
if (slave_count == dev->slave_count && 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); w1_attach_slave_device(dev, tmp);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment