diff options
| author | David Fries <David@Fries.net> | 2014-02-08 13:37:38 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-08 13:30:43 -0800 |
| commit | 7841b647b9c1b118ae4eed33a0af934818e60553 (patch) | |
| tree | 9227726fe93a49bdbf10d1e226c92d5e408a39aa /drivers/w1 | |
| parent | d3a8a9dbb903c73a7ec2deae4c9b7d74b6834f4c (diff) | |
| download | op-kernel-dev-7841b647b9c1b118ae4eed33a0af934818e60553.zip op-kernel-dev-7841b647b9c1b118ae4eed33a0af934818e60553.tar.gz | |
Revert ds1wm.c from "w1: hold bus_mutex in netlink and search"
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.
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>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/ds1wm.c | 4 |
1 files changed, 1 insertions, 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); } /* --------------------------------------------------------------------- */ |
