From 4024b621af56498fcaba69dcce0aabcd7ce79757 Mon Sep 17 00:00:00 2001
From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Wed, 22 Aug 2007 14:01:51 -0700
Subject: [PATCH] --- yaml --- r: 64255 b: refs/heads/master c:
 59d9445e851976d973a5a4009f80a3d55959d231 h: refs/heads/master i:   64253:
 15d7cadf84180fe22fb6ad5286654a3d4992490d   64251:
 a26ad4319d30e84134bf4b38650f1c006ee26d14   64247:
 50d495bdd217426544ef5ef0c1f6dfb6403d4c63   64239:
 bd5ac288bf2e7c8b3c8990078af3700c2a7640a7   64223:
 1699a88363db63d50a02fc986a7a738bbc54facc   64191:
 487c2bdfdadb1192a190e890a5ecb46b74a5041d   64127:
 a444e32593dfe369aba7d7f0f186f58f92355d3b   63999:
 52f3550bfbfb933129ec064457126de1a733f355 v: v3

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

diff --git a/[refs] b/[refs]
index 948132bb8513..2b15aabc47a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a89182c76e54134081cfec6409df06731c5cb98f
+refs/heads/master: 59d9445e851976d973a5a4009f80a3d55959d231
diff --git a/trunk/drivers/w1/w1_int.c b/trunk/drivers/w1/w1_int.c
index 2fbd8dd16df5..6840dfebe4d4 100644
--- a/trunk/drivers/w1/w1_int.c
+++ b/trunk/drivers/w1/w1_int.c
@@ -170,22 +170,24 @@ void __w1_remove_master_device(struct w1_master *dev)
 
 void w1_remove_master_device(struct w1_bus_master *bm)
 {
-	struct w1_master *dev = NULL;
+	struct w1_master *dev, *found = NULL;
 
 	list_for_each_entry(dev, &w1_masters, w1_master_entry) {
 		if (!dev->initialized)
 			continue;
 
-		if (dev->bus_master->data == bm->data)
+		if (dev->bus_master->data == bm->data) {
+			found = dev;
 			break;
+		}
 	}
 
-	if (!dev) {
+	if (!found) {
 		printk(KERN_ERR "Device doesn't exist.\n");
 		return;
 	}
 
-	__w1_remove_master_device(dev);
+	__w1_remove_master_device(found);
 }
 
 EXPORT_SYMBOL(w1_add_master_device);