From 0d671b272af9eb06260ab3fd210d454e98dd4216 Mon Sep 17 00:00:00 2001
From: David Fries <david@fries.net>
Date: Wed, 15 Oct 2008 22:04:39 -0700
Subject: W1: abort search early on on exit

Early abort if the master driver or the hardware goes away in the middle
of a bus search operation.  The alternative is to spam the print buffer up
to 64*64 times with read errors in the case of USB.

Signed-off-by: David Fries <david@fries.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 drivers/w1/w1.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'drivers/w1')

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 25640f68172..aac03f151fe 100644
--- a/drivers/w1/w1.c
+++ b/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 ) {
-- 
cgit v1.2.3