---

yaml --- r: 285431 b: refs/heads/master c: 57e43cf h: refs/heads/master i: 285429: 69e103d 285427: 420f543 285423: 45b8c3e v: v3
git-mirror · Dec 30, 2011 · 4dea3c8 · 4dea3c8
1 parent 49fd490
commit 4dea3c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4419b8aca8dc1339a8f01c5e9efbed500780131e
+refs/heads/master: 57e43cfb6cf9b88d776f3193f12cd6f81177bd6e
diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c
@@ -1096,7 +1096,7 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
 	 * beggining of qbuf processing. This way the queue status is
 	 * consistent after getting driver's lock back.
 	 */
-	if (b->type == V4L2_MEMORY_USERPTR) {
+	if (q->memory == V4L2_MEMORY_USERPTR) {
 		mmap_sem = &current->mm->mmap_sem;
 		call_qop(q, wait_prepare, q);
 		down_read(mmap_sem);