aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/w1/w1.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index fd630cec0e79..8d7821899cc1 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -522,10 +522,11 @@ void w1_slave_found(unsigned long data, u64 rn)
522 slave_count++; 522 slave_count++;
523 } 523 }
524 524
525 if (slave_count == dev->slave_count && rn ) { 525 rn = cpu_to_le64(rn);
526 tmp = cpu_to_le64(rn); 526
527 if(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7)) 527 if (slave_count == dev->slave_count &&
528 w1_attach_slave_device(dev, (struct w1_reg_num *) &rn); 528 rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) {
529 w1_attach_slave_device(dev, tmp);
529 } 530 }
530 531
531 atomic_dec(&dev->refcnt); 532 atomic_dec(&dev->refcnt);