W1: don't delay search start
[linux-2.6.git] / drivers / w1 / w1.c
index aac03f1..730faa4 100644 (file)
@@ -813,21 +813,14 @@ int w1_process(void *data)
        struct w1_master *dev = (struct w1_master *) data;
 
        while (!kthread_should_stop() && !test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
+               if (dev->search_count) {
+                       mutex_lock(&dev->mutex);
+                       w1_search_process(dev, W1_SEARCH);
+                       mutex_unlock(&dev->mutex);
+               }
+
                try_to_freeze();
                msleep_interruptible(w1_timeout * 1000);
-
-               if (kthread_should_stop() || test_bit(W1_MASTER_NEED_EXIT, &dev->flags))
-                       break;
-
-               if (!dev->initialized)
-                       continue;
-
-               if (dev->search_count == 0)
-                       continue;
-
-               mutex_lock(&dev->mutex);
-               w1_search_process(dev, W1_SEARCH);
-               mutex_unlock(&dev->mutex);
        }
 
        atomic_dec(&dev->refcnt);