From 8bbb1feb8e909c4a981590f5118641c6535a408c Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Wed, 10 Apr 2013 08:05:00 -0300
Subject: [PATCH] --- yaml --- r: 367031 b: refs/heads/master c:
 228b791bfd52f437fd9a04fe9432dfec9c0d0333 h: refs/heads/master i:   367029:
 9db005ad984d94cf8489cc85fe37d303a867ecc2   367027:
 55ef1267d828939503939f366e40812d7cc9bdee   367023:
 026a841c6f03eb6000dae9cbdf727e490b74bff0 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f2e03679149c..701fb7601500 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48fc9e26705f3c681a5a5fcd97f28be2c2393237
+refs/heads/master: 228b791bfd52f437fd9a04fe9432dfec9c0d0333
diff --git a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 073b3b35f8f4..57fadead0643 100644
--- a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -398,7 +398,7 @@ dt3155_open(struct file *filp)
 		pd->field_count = 0;
 		ret = vb2_queue_init(pd->q);
 		if (ret < 0)
-			return ret;
+			goto err_request_irq;
 		INIT_LIST_HEAD(&pd->dmaq);
 		spin_lock_init(&pd->lock);
 		/* disable all irqs, clear all irq flags */
@@ -410,6 +410,7 @@ dt3155_open(struct file *filp)
 			goto err_request_irq;
 	}
 	pd->users++;
+	mutex_unlock(&pd->mux);
 	return 0; /* success */
 err_request_irq:
 	kfree(pd->q);