1 files changed, 22 insertions, 3 deletions

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 590bd8a7cd1b..9b084db739c7 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -75,8 +75,10 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
         atomic_set(&dev->refcnt, 2);
 
         INIT_LIST_HEAD(&dev->slist);
+        INIT_LIST_HEAD(&dev->async_list);
         mutex_init(&dev->mutex);
         mutex_init(&dev->bus_mutex);
+        mutex_init(&dev->list_mutex);
 
         memcpy(&dev->dev, device, sizeof(struct device));
         dev_set_name(&dev->dev, "w1_bus_master%u", dev->id);
@@ -103,6 +105,10 @@ static void w1_free_dev(struct w1_master *dev)
         device_unregister(&dev->dev);
 }
 
+/**
+ * w1_add_master_device() - registers a new master device
+ * @master:     master bus device to register
+ */
 int w1_add_master_device(struct w1_bus_master *master)
 {
         struct w1_master *dev, *entry;
@@ -172,6 +178,7 @@ int w1_add_master_device(struct w1_bus_master *master)
 
 #if 0 /* Thread cleanup code, not required currently. */
 err_out_kill_thread:
+        set_bit(W1_ABORT_SEARCH, &dev->flags);
         kthread_stop(dev->thread);
 #endif
 err_out_rm_attr:
@@ -187,16 +194,22 @@ void __w1_remove_master_device(struct w1_master *dev)
         struct w1_netlink_msg msg;
         struct w1_slave *sl, *sln;
 
-        kthread_stop(dev->thread);
-
         mutex_lock(&w1_mlock);
         list_del(&dev->w1_master_entry);
         mutex_unlock(&w1_mlock);
 
+        set_bit(W1_ABORT_SEARCH, &dev->flags);
+        kthread_stop(dev->thread);
+
         mutex_lock(&dev->mutex);
-        list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry)
+        mutex_lock(&dev->list_mutex);
+        list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
+                mutex_unlock(&dev->list_mutex);
                 w1_slave_detach(sl);
+                mutex_lock(&dev->list_mutex);
+        }
         w1_destroy_master_attributes(dev);
+        mutex_unlock(&dev->list_mutex);
         mutex_unlock(&dev->mutex);
         atomic_dec(&dev->refcnt);
 
@@ -206,7 +219,9 @@ void __w1_remove_master_device(struct w1_master *dev)
 
                 if (msleep_interruptible(1000))
                         flush_signals(current);
+                w1_process_callbacks(dev);
         }
+        w1_process_callbacks(dev);
 
         memset(&msg, 0, sizeof(msg));
         msg.id.mst.id = dev->id;
@@ -216,6 +231,10 @@ void __w1_remove_master_device(struct w1_master *dev)
         w1_free_dev(dev);
 }
 
+/**
+ * w1_remove_master_device() - unregister a master device
+ * @bm: master bus device to remove
+ */
 void w1_remove_master_device(struct w1_bus_master *bm)
 {
         struct w1_master *dev, *found = NULL;