Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[cascardo/linux.git] / drivers / w1 / masters / ds1wm.c

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index b077b8b..e0b8a4b 100644 (file)
--- 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);
 }
 
 /* --------------------------------------------------------------------- */
@@ -565,7 +563,7 @@ static struct platform_driver ds1wm_driver = {
 
 static int __init ds1wm_init(void)
 {
-       printk("DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n");
+       pr_info("DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n");
        return platform_driver_register(&ds1wm_driver);
 }