X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fw1%2Fw1.c;h=33e50310e9e02418763188665457b127f4ae7520;hb=a5569a565f7315fe7241cf963f2cc74e53871e11;hp=070217322c9fb30e98b1db28c476bc68b5cdbbef;hpb=c4ec20717313daafba59225f812db89595952b83;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 070217322c9..33e50310e9e 100644
--- a/drivers/w1/w1.c
+++ b/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;
 	}