From 6c5d64d9056c312744d135a7b2ad97a439c020a1 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 13 Apr 2012 16:39:06 +0300
Subject: [PATCH] --- yaml --- r: 304029 b: refs/heads/master c:
 eda70f1dfc9e5165b9413dbf1ccb5c108f26a18c h: refs/heads/master i:   304027:
 cca34b3eefc10311f948ed7cf7bbb4bd9d10879c v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/w1/slaves/w1_ds28e04.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 957a60d862b2..6843e558b9d8 100644
--- 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
index f652db3782bf..4aa1aa90480d 100644
--- 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;