Auto merge with /home/aegl/GIT/linus

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 312cf3220f12..8a9c42822502 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -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);
         }