From ae1996a02f7c6f39880c888a04357a5635105de8 Mon Sep 17 00:00:00 2001 From: Evgeniy Polyakov Date: Mon, 14 Jan 2008 00:55:08 -0800 Subject: [PATCH] --- yaml --- r: 75443 b: refs/heads/master c: a2a6c74d34c3ae9de6825767a30ab17f709b59ce h: refs/heads/master i: 75441: 4e22abc34faf71f4fed6d005f28623d8c3cbb4b2 75439: 54da3fa0dbad4bb314af35b9f201d000ddd72867 v: v3 --- [refs] | 2 +- trunk/drivers/w1/w1.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 09b2260d9562..c0525e0ab452 100644 --- 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 index 070217322c9f..33e50310e9e0 100644 --- 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; }