Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mirror_ubuntu-artful-kernel.git] / drivers / w1 / masters / ds1wm.c

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 649eb0b2d3ff5116412c8def2336b509def85896..7c294f4dc0ed85bcaad3f36719509b134f55d5a9 100644 (file)
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -334,7 +334,9 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
                        return;
                }
 
+               mutex_lock(&master_dev->bus_mutex);
                if (ds1wm_reset(ds1wm_data)) {
+                       mutex_unlock(&master_dev->bus_mutex);
                        dev_dbg(&ds1wm_data->pdev->dev,
                                "pass: %d reset error (or no slaves)\n", pass);
                        break;
@@ -387,6 +389,7 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
 
                }
                if (ds1wm_data->read_error) {
+                       mutex_unlock(&master_dev->bus_mutex);
                        dev_err(&ds1wm_data->pdev->dev,
                                "pass: %d read error, retrying\n", pass);
                        break;
@@ -400,6 +403,7 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
                dev_dbg(&ds1wm_data->pdev->dev,
                        "pass: %d resetting bus\n", pass);
                ds1wm_reset(ds1wm_data);
+               mutex_unlock(&master_dev->bus_mutex);
                if ((r_prime & ((u64)1 << 63)) && (d & ((u64)1 << 63))) {
                        dev_err(&ds1wm_data->pdev->dev,
                                "pass: %d bus error, retrying\n", pass);