---

yaml --- r: 361343 b: refs/heads/master c: 9d1817c h: refs/heads/master i: 361341: 3272ed1 361339: 1e21ce9 361335: f705246 361327: f1675fb 361311: b16db6d 361279: 69f1184 361215: 137c05c v: v3
git-mirror · Mar 12, 2013 · c72b06c · c72b06c
1 parent 3c4dcff
commit c72b06c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34ccd8738e34180af34544d2bdd053e60e44a224
+refs/heads/master: 9d1817cab2f030f6af360e961cc69bb1da8ad765
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
@@ -924,7 +924,8 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb
 			tmp64 = (triplet_ret >> 2);
 			rn |= (tmp64 << i);
 
-			if (kthread_should_stop()) {
+			/* ensure we're called from kthread and not by netlink callback */
+			if (!dev->priv && kthread_should_stop()) {
 				mutex_unlock(&dev->bus_mutex);
 				dev_dbg(&dev->dev, "Abort w1_search\n");
 				return;