Revert ds1wm.c from "w1: hold bus_mutex in netlink and search"
authorDavid Fries <David@Fries.net>
Sat, 8 Feb 2014 19:37:38 +0000 (13:37 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 8 Feb 2014 21:30:43 +0000 (13:30 -0800)
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>
drivers/w1/masters/ds1wm.c

index b077b8b427589aa98f0365e4c1c6ae09a579bb74..02df3b1381d2f639c2ff5d756adad8915198fde7 100644 (file)
@@ -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);
 }
 
 /* --------------------------------------------------------------------- */