X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fw1%2Fw1.c;h=5149d4ecf0455e73fdba0405a303fd044c29b74e;hb=fa64bf862747c1ad76df753b2b40c7557debfc28;hp=c374978238515cd6a0e23b464076be91a9fcb744;hpb=995a0605a6665858d73f9e80053414909be33f27;p=pandora-kernel.git

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index c37497823851..5149d4ecf045 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -918,7 +918,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()) {
 				dev_dbg(&dev->dev, "Abort w1_search\n");
 				return;
 			}