w1: hold bus_mutex in netlink and search

[karo-tx-linux.git] / drivers / w1 / masters / ds1wm.c

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 02df3b1381d2f639c2ff5d756adad8915198fde7..b077b8b427589aa98f0365e4c1c6ae09a579bb74 100644 (file)
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -326,13 +326,14 @@ 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");
-                       return;
+                       break;
                }
 
                mutex_lock(&master_dev->bus_mutex);
@@ -439,6 +440,7 @@ 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);
 }
 
 /* --------------------------------------------------------------------- */