---

yaml
---
r: 64255
b: refs/heads/master
c: 59d9445
h: refs/heads/master
i:
  64253: 15d7cad
  64251: a26ad43
  64247: 50d495b
  64239: bd5ac28
  64223: 1699a88
  64191: 487c2bd
  64127: a444e32
  63999: 52f3550
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a89182c76e54134081cfec6409df06731c5cb98f
+refs/heads/master: 59d9445e851976d973a5a4009f80a3d55959d231

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);