W1: don't delay search start
[linux-2.6.git] / drivers / w1 / w1_int.c
index ed32280..36ff402 100644 (file)
@@ -61,6 +61,9 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
        dev->slave_ttl          = slave_ttl;
         dev->search_count      = -1; /* continual scan */
 
+       /* 1 for w1_process to decrement
+        * 1 for __w1_remove_master_device to decrement
+        */
        atomic_set(&dev->refcnt, 2);
 
        INIT_LIST_HEAD(&dev->slist);
@@ -109,23 +112,23 @@ int w1_add_master_device(struct w1_bus_master *master)
        if (!dev)
                return -ENOMEM;
 
+       retval =  w1_create_master_attributes(dev);
+       if (retval)
+               goto err_out_free_dev;
+
+       memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
+
+       dev->initialized = 1;
+
        dev->thread = kthread_run(&w1_process, dev, "%s", dev->name);
        if (IS_ERR(dev->thread)) {
                retval = PTR_ERR(dev->thread);
                dev_err(&dev->dev,
                         "Failed to create new kernel thread. err=%d\n",
                         retval);
-               goto err_out_free_dev;
+               goto err_out_rm_attr;
        }
 
-       retval =  w1_create_master_attributes(dev);
-       if (retval)
-               goto err_out_kill_thread;
-
-       memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
-
-       dev->initialized = 1;
-
        mutex_lock(&w1_mlock);
        list_add(&dev->w1_master_entry, &w1_masters);
        mutex_unlock(&w1_mlock);
@@ -137,8 +140,13 @@ int w1_add_master_device(struct w1_bus_master *master)
 
        return 0;
 
+#if 0 /* Thread cleanup code, not required currently. */
 err_out_kill_thread:
+       set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
        kthread_stop(dev->thread);
+#endif
+err_out_rm_attr:
+       w1_destroy_master_attributes(dev);
 err_out_free_dev:
        w1_free_dev(dev);