leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert ds1wm.c from "w1: hold bus_mutex in netlink and search"

Browse Source 
This reverts ds1wm.c from commit d3a8a9dbb9.
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.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Fries <David@Fries.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Fries
2014-02-08 13:37:38 -06:00
committed by Greg Kroah-Hartman
parent d3a8a9dbb9
commit 7841b647b9
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/w1/masters/ds1wm.c
View File

@@ -326,14 +326,13 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
unsigned slaves_found = 0; unsigned slaves_found = 0;
unsigned int pass = 0; unsigned int pass = 0;
mutex_lock(&master_dev->bus_mutex);
dev_dbg(&ds1wm_data->pdev->dev, "search begin\n"); dev_dbg(&ds1wm_data->pdev->dev, "search begin\n");
while (true) { while (true) {
++pass; ++pass;
if (pass > 100) { if (pass > 100) {
dev_dbg(&ds1wm_data->pdev->dev, dev_dbg(&ds1wm_data->pdev->dev,
"too many attempts (100), search aborted\n"); "too many attempts (100), search aborted\n");
break; return;
} }
mutex_lock(&master_dev->bus_mutex); 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, dev_dbg(&ds1wm_data->pdev->dev,
"pass: %d total: %d search done ms d bit pos: %d\n", pass, "pass: %d total: %d search done ms d bit pos: %d\n", pass,
slaves_found, ms_discrep_bit); slaves_found, ms_discrep_bit);
mutex_unlock(&master_dev->bus_mutex);
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */