From c72b06c01196d4663381241f34de4d3ae8bc2582 Mon Sep 17 00:00:00 2001
From: Marcin Jurkowski <marcin1j@gmail.com>
Date: Sat, 2 Mar 2013 14:50:15 +0100
Subject: [PATCH] --- yaml --- r: 361343 b: refs/heads/master c:
 9d1817cab2f030f6af360e961cc69bb1da8ad765 h: refs/heads/master i:   361341:
 3272ed135e01b23438089859dad6b1ccc71f3f98   361339:
 1e21ce9d5ac9ad7799279d4305b6b859b64951ae   361335:
 f705246a4c731d128136fce5b7755d59123957a4   361327:
 f1675fb2b3bff17d62c81fd46dc32e7c91dee1d3   361311:
 b16db6d4295d490dc1fe04882b66c3627ea09b26   361279:
 69f1184200e0ccdcd4886eb1a625c30380f593fa   361215:
 137c05c896b89150e5a9673cddee25e25b1d57b3 v: v3

---
 [refs]                | 2 +-
 trunk/drivers/w1/w1.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1bd7dcdbcbce..a004e5346577 100644
--- 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
index 7994d933f040..7ce277d2bb67 100644
--- 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;