From c3c127ed13e546b371ae09f2b0922961120f7321 Mon Sep 17 00:00:00 2001
From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Thu, 30 Jun 2005 22:52:38 +0400
Subject: [PATCH] --- yaml --- r: 4655 b: refs/heads/master c:
 0e65f82814e9828d3ff54988de9e7c0b36794daa h: refs/heads/master i:   4653:
 c2355db1a238a30bb424f33bd2116770b799fcbd   4651:
 71eafb0d06f29c50cf0c5d7e0e6c791c105d2ee7   4647:
 85b1df622aafe42f49bea189fc8eaa9ee357f8e0   4639:
 a7c5c4b30d45e00528dab8832fbb25a735146b68 v: v3

---
 [refs]                | 2 +-
 trunk/drivers/w1/w1.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 43147dcaadfa..caa9c1ad8a48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80efa8c72006a1c04004f8fb07b22073348e4bf2
+refs/heads/master: 0e65f82814e9828d3ff54988de9e7c0b36794daa
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
index 312cf3220f12..8a9c42822502 100644
--- a/trunk/drivers/w1/w1.c
+++ b/trunk/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);
 	}