---

yaml --- r: 83485 b: refs/heads/master c: 18a2354 h: refs/heads/master i: 83483: b8d9650 v: v3
git-mirror · Feb 6, 2008 · f61b858 · f61b858
1 parent ff63820
commit f61b858
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d42c983ff7ba4b55d8635899186ae2ef2578ad
+refs/heads/master: 18a2354db7d7e43da08c0351263fd5b5fc20a38d
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
@@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u64 rn)
 	struct w1_slave *sl;
 	struct list_head *ent;
 	struct w1_reg_num *tmp;
-	int family_found = 0;
 	struct w1_master *dev;
 	u64 rn_le = cpu_to_le64(rn);
 
@@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u64 rn)
 		    sl->reg_num.crc == tmp->crc) {
 			set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
 			break;
-		} else if (sl->reg_num.family == tmp->family) {
-			family_found = 1;
-			break;
 		}
 
 		slave_count++;