* Re: [PATCH] Revert ds1wm.c from "w1: hold bus_mutex in netlink and search"
[not found] ` <20140208193513.GA13359@kroah.com>
@ 2014-02-08 19:37 ` David Fries
0 siblings, 0 replies; only message in thread
From: David Fries @ 2014-02-08 19:37 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Dan Carpenter, kbuild, Evgeniy Polyakov, linux-kernel
This reverts ds1wm.c from commit d3a8a9dbb903c73a7ec2deae4c9b7d74b6834f4c.
Of the three files changed ds1wm.c ds2490.c and w1_netlink.c, it turns out
ds1wm.c was locking bus_mutex, but inside the loop and I missed it.
Reverting ds1wm.c to the previous version.
Signed-off-by: David Fries <David@Fries.net>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/w1/masters/ds1wm.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index b077b8b..02df3b1 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -326,14 +326,13 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
unsigned slaves_found = 0;
unsigned int pass = 0;
- mutex_lock(&master_dev->bus_mutex);
dev_dbg(&ds1wm_data->pdev->dev, "search begin\n");
while (true) {
++pass;
if (pass > 100) {
dev_dbg(&ds1wm_data->pdev->dev,
"too many attempts (100), search aborted\n");
- break;
+ return;
}
mutex_lock(&master_dev->bus_mutex);
@@ -440,7 +439,6 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
dev_dbg(&ds1wm_data->pdev->dev,
"pass: %d total: %d search done ms d bit pos: %d\n", pass,
slaves_found, ms_discrep_bit);
- mutex_unlock(&master_dev->bus_mutex);
}
/* --------------------------------------------------------------------- */
--
1.7.10.4
^ permalink raw reply [flat|nested] only message in thread