diff options
Diffstat (limited to 'drivers/w1/w1_int.c')
-rw-r--r-- | drivers/w1/w1_int.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 36ff40250b61..bd877b24ce42 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c | |||
@@ -142,7 +142,6 @@ int w1_add_master_device(struct w1_bus_master *master) | |||
142 | 142 | ||
143 | #if 0 /* Thread cleanup code, not required currently. */ | 143 | #if 0 /* Thread cleanup code, not required currently. */ |
144 | err_out_kill_thread: | 144 | err_out_kill_thread: |
145 | set_bit(W1_MASTER_NEED_EXIT, &dev->flags); | ||
146 | kthread_stop(dev->thread); | 145 | kthread_stop(dev->thread); |
147 | #endif | 146 | #endif |
148 | err_out_rm_attr: | 147 | err_out_rm_attr: |
@@ -158,7 +157,6 @@ void __w1_remove_master_device(struct w1_master *dev) | |||
158 | struct w1_netlink_msg msg; | 157 | struct w1_netlink_msg msg; |
159 | struct w1_slave *sl, *sln; | 158 | struct w1_slave *sl, *sln; |
160 | 159 | ||
161 | set_bit(W1_MASTER_NEED_EXIT, &dev->flags); | ||
162 | kthread_stop(dev->thread); | 160 | kthread_stop(dev->thread); |
163 | 161 | ||
164 | mutex_lock(&w1_mlock); | 162 | mutex_lock(&w1_mlock); |