Commit a2a6c74d authored Jan 14, 2008 by Evgeniy Polyakov Committed by Linus Torvalds Jan 14, 2008

w1: decrement slave counter only in ->release() callback



Decrement the slave counter only in ->release() callback instead of both
in ->release() and w1 control.

Patch is based on debug work and preliminary patch made by Henri Laakso.
Henri noticed in debug that this counter becomes negative after w1 slave
device is physically removed.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Henri Laakso <henri.laakso@wapice.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cb2a5205

drivers/w1/w1.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message