The patch titled
w1: decrement slave counter only in ->release() callback
has been removed from the -mm tree. Its filename was
w1-decrement-slave-counter-only-in-release-callback.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: w1: decrement slave counter only in ->release() callback
From: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
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@xxxxxxxxxxx>
Cc: Henri Laakso <henri.laakso@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/w1/w1.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN drivers/w1/w1.c~w1-decrement-slave-counter-only-in-release-callback drivers/w1/w1.c
--- a/drivers/w1/w1.c~w1-decrement-slave-counter-only-in-release-callback
+++ a/drivers/w1/w1.c
@@ -869,11 +869,9 @@ void w1_search_process(struct w1_master
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;
}
_
Patches currently in -mm which might be from johnpol@xxxxxxxxxxx are
origin.patch
git-cryptodev.patch
ds1wm-decouple-host-irq-and-intr-active-state-settings.patch
w1-remove-unused-and-confusing-variable.patch
w1-gpio-add-gpio-w1-bus-master-driver.patch
w1-gpio-add-gpio-w1-bus-master-driver-v3.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
