---

yaml --- r: 75443 b: refs/heads/master c: a2a6c74 h: refs/heads/master i: 75441: 4e22abc 75439: 54da3fa v: v3
git-mirror · Jan 14, 2008 · ae1996a · ae1996a
1 parent 7d26960
commit ae1996a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb2a52052cebe4716e83b9d2e53682ba00f67de6
+refs/heads/master: a2a6c74d34c3ae9de6825767a30ab17f709b59ce
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
@@ -869,11 +869,9 @@ void w1_search_process(struct w1_master *dev, u8 search_type)
 	w1_search_devices(dev, search_type, w1_slave_found);
 
 	list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
-		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) {
+		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl)
 			w1_slave_detach(sl);
-
-			dev->slave_count--;
-		} else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
+		else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
 			sl->ttl = dev->slave_ttl;
 	}