---

yaml --- r: 4655 b: refs/heads/master c: 0e65f82 h: refs/heads/master i: 4653: c2355db 4651: 71eafb0 4647: 85b1df6 4639: a7c5c4b v: v3
git-mirror · Jul 11, 2005 · c3c127e · c3c127e
1 parent dda1fd4
commit c3c127e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);
 	}