From 4dea3c85c837d2c053e957b2b0c6fbef47074713 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 30 Dec 2011 16:10:44 -0200
Subject: [PATCH] --- yaml --- r: 285431 b: refs/heads/master c:
 57e43cfb6cf9b88d776f3193f12cd6f81177bd6e h: refs/heads/master i:   285429:
 69e103d5e52e5aefa83733433dcf879ccfcf5c2c   285427:
 420f54397504b165bb9cf87ae2af2e8db6b9e04c   285423:
 45b8c3e4e840a34846d13184378e871a9442b38c v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/videobuf2-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0215f22ef31a..0971f4108f6a 100644
--- 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
index 26cfbf5c9f8c..2e8f1df775b6 100644
--- 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);