From 2689668a100f5a9926d96382943f7b2a9d90f15f Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 8 Jun 2011 06:15:05 -0300 Subject: [PATCH] --- yaml --- r: 254630 b: refs/heads/master c: bf7b73efb7f52abf56b512546c3bbc35001dd696 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-core.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 6d6767b21421..7511e5856b7f 100644 --- 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 index 6ba1461d51ef..6489aa26e788 100644 --- 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