---

yaml --- r: 367031 b: refs/heads/master c: 228b791 h: refs/heads/master i: 367029: 9db005a 367027: 55ef126 367023: 026a841 v: v3
git-mirror · Apr 14, 2013 · 8bbb1fe · 8bbb1fe
1 parent dba2efd
commit 8bbb1fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);