---

yaml --- r: 254630 b: refs/heads/master c: bf7b73e h: refs/heads/master v: v3
git-mirror · Jul 1, 2011 · 2689668 · 2689668
1 parent 3c601ab
commit 2689668
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a52a82fc3a397261ecbcbd441498be58997379c8
+refs/heads/master: bf7b73efb7f52abf56b512546c3bbc35001dd696
diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c
@@ -492,13 +492,6 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
 		return -EINVAL;
 	}
 
-	/*
-	 * If the same number of buffers and memory access method is requested
-	 * then return immediately.
-	 */
-	if (q->memory == req->memory && req->count == q->num_buffers)
-		return 0;
-
 	if (req->count == 0 || q->num_buffers != 0 || q->memory != req->memory) {
 		/*
 		 * We already have buffers allocated, so first check if they