From: johnpol@2ka.mipt.ru Date: Tue, 19 Apr 2005 04:16:57 +0000 (-0700) Subject: [PATCH] w1: real fix for big endian machines. X-Git-Tag: v2.6.12-rc3~25^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8523ff45672a5c9209ab7459142e37e7cd393e6c;p=linux-2.6-omap-h63xx.git [PATCH] w1: real fix for big endian machines. Real fix for big endian machines - crc must be calculated using little endian byte order. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index fd630cec0e7..8d7821899cc 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -522,10 +522,11 @@ void w1_slave_found(unsigned long data, u64 rn) slave_count++; } - if (slave_count == dev->slave_count && rn ) { - tmp = cpu_to_le64(rn); - if(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7)) - w1_attach_slave_device(dev, (struct w1_reg_num *) &rn); + rn = cpu_to_le64(rn); + + if (slave_count == dev->slave_count && + rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) { + w1_attach_slave_device(dev, tmp); } atomic_dec(&dev->refcnt);