2 files changed, 7 insertions, 6 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)
                 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);
diff --git a/drivers/w1/w1_smem.c b/drivers/w1/w1_smem.c
index ab82eb7ed74f..a54e425217a0 100644
--- a/drivers/w1/w1_smem.c
+++ b/drivers/w1/w1_smem.c
@@ -60,7 +60,7 @@ static ssize_t w1_smem_read_val(struct device *dev, char *buf)
         int i;
         ssize_t count = 0;
         
-        for (i = 0; i < 9; ++i)
+        for (i = 0; i < 8; ++i)
                 count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
         count += sprintf(buf + count, "\n");
 
@@ -87,7 +87,7 @@ static ssize_t w1_smem_read_bin(struct kobject *kobj, char *buf, loff_t off, siz
                 count = 0;
                 goto out;
         }
-        for (i = 0; i < 9; ++i)
+        for (i = 0; i < 8; ++i)
                 count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
         count += sprintf(buf + count, "\n");