* [patch] w1: w1_ds28e04: unlock on error path in w1_f1C_write_pio()
@ 2012-04-13 13:39 Dan Carpenter
2012-04-14 19:06 ` Evgeniy Polyakov
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2012-04-13 13:39 UTC (permalink / raw)
To: Evgeniy Polyakov
Cc: Markus Franke, Greg Kroah-Hartman, linux-kernel, kernel-janitors
We should unlock here before returning.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/w1/slaves/w1_ds28e04.c b/drivers/w1/slaves/w1_ds28e04.c
index f652db3..4aa1aa9 100644
--- a/drivers/w1/slaves/w1_ds28e04.c
+++ b/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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] w1: w1_ds28e04: unlock on error path in w1_f1C_write_pio()
2012-04-13 13:39 [patch] w1: w1_ds28e04: unlock on error path in w1_f1C_write_pio() Dan Carpenter
@ 2012-04-14 19:06 ` Evgeniy Polyakov
0 siblings, 0 replies; 2+ messages in thread
From: Evgeniy Polyakov @ 2012-04-14 19:06 UTC (permalink / raw)
To: Dan Carpenter
Cc: Markus Franke, Greg Kroah-Hartman, linux-kernel, kernel-janitors
On Fri, Apr 13, 2012 at 04:39:06PM +0300, Dan Carpenter (dan.carpenter@oracle.com) wrote:
> We should unlock here before returning.
Looks good, thank you, Dan
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Greg, please pull it into your tree
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
--
Evgeniy Polyakov
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-14 19:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-13 13:39 [patch] w1: w1_ds28e04: unlock on error path in w1_f1C_write_pio() Dan Carpenter
2012-04-14 19:06 ` Evgeniy Polyakov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).