diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/w1/w1.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 070217322c9f..33e50310e9e0 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) | |||
869 | w1_search_devices(dev, search_type, w1_slave_found); | 869 | w1_search_devices(dev, search_type, w1_slave_found); |
870 | 870 | ||
871 | list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) { | 871 | list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) { |
872 | if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) { | 872 | if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) |
873 | w1_slave_detach(sl); | 873 | w1_slave_detach(sl); |
874 | 874 | else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags)) | |
875 | dev->slave_count--; | ||
876 | } else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags)) | ||
877 | sl->ttl = dev->slave_ttl; | 875 | sl->ttl = dev->slave_ttl; |
878 | } | 876 | } |
879 | 877 | ||