From fa0508517adbccee2bdcc8160c7f03b2b54cbf22 Mon Sep 17 00:00:00 2001
From: David Fries <david@fries.net>
Date: Wed, 15 Oct 2008 22:04:39 -0700
Subject: [PATCH] --- yaml --- r: 114915 b: refs/heads/master c:
 0d671b272af9eb06260ab3fd210d454e98dd4216 h: refs/heads/master i:   114913:
 0564157cc4b884cd81fb5b46bfdcf37997c7e4de   114911:
 b46d36d2080a2be3eed58e1d4033a3ce80c092bb v: v3

---
 [refs]                | 2 +-
 trunk/drivers/w1/w1.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b3882422609e..cf279d47e526 100644
--- 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
index 25640f681729..aac03f151fe0 100644
--- 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 ) {