From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 11 Mar 2011 09:07:27 +0000 (-0300)
Subject: [media] v4l2: vb2: one more fix for REQBUFS()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=31901a078af29c33c736dcbf815656920e904632;p=deliverable%2Flinux.git

[media] v4l2: vb2: one more fix for REQBUFS()

Return immediately if the target number of buffers is the same as
the current one and memory access type doesn't change.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c
index c5f99c7d3979..2baf7dbdc01d 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/video/videobuf2-core.c
@@ -488,6 +488,13 @@ 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