---

yaml --- r: 114915 b: refs/heads/master c: 0d671b2 h: refs/heads/master i: 114913: 0564157 114911: b46d36d v: v3
git-mirror · Oct 16, 2008 · fa05085 · fa05085
1 parent a593870
commit fa05085
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c30c9b15187e977ab5928f7276e9dfcd8d6f9460
+refs/heads/master: 0d671b272af9eb06260ab3fd210d454e98dd4216
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
@@ -772,6 +772,11 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb
 			/* extract the direction taken & update the device number */
 			tmp64 = (triplet_ret >> 2);
 			rn |= (tmp64 << i);
+
+			if (test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
+				printk(KERN_INFO "Abort w1_search (exiting)\n");
+				return;
+			}
 		}
 
 		if ( (triplet_ret & 0x03) != 0x03 ) {