---

yaml --- r: 304029 b: refs/heads/master c: eda70f1 h: refs/heads/master i: 304027: cca34b3 v: v3
git-mirror · Apr 18, 2012 · 6c5d64d · 6c5d64d
1 parent c33bad9
commit 6c5d64d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f1e12512e9f1276b68c8b14a60961658c73336f
+refs/heads/master: eda70f1dfc9e5165b9413dbf1ccb5c108f26a18c
diff --git a/trunk/drivers/w1/slaves/w1_ds28e04.c b/trunk/drivers/w1/slaves/w1_ds28e04.c
@@ -309,8 +309,10 @@ static ssize_t w1_f1C_write_pio(struct file *filp, struct kobject *kobj,
 	mutex_lock(&sl->master->mutex);
 
 	/* Write the PIO data */
-	if (w1_reset_select_slave(sl))
+	if (w1_reset_select_slave(sl)) {
+		mutex_unlock(&sl->master->mutex);
 		return -1;
+	}
 
 	/* set bit 7..2 to value '1' */
 	*buf = *buf | 0xFC;