media: videobuf2-v4l2: set last_buffer_dequeued in dqbuf

last_buffer_dequeued was set to true in __fill_v4l2_buffer, but this
is called for qbuf as well. Move it to vb2_dqbuf.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index fb9ac7696fc6e1f117a91c11127cbc6b8fd6df3c..40d76eb4c2fe79b4ff8e46675284afcd7afa9e86 100644 (file)
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -563,11 +563,6 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb)
                b->flags |= V4L2_BUF_FLAG_REQUEST_FD;
                b->request_fd = vbuf->request_fd;
        }
-
-       if (!q->is_output &&
-               b->flags & V4L2_BUF_FLAG_DONE &&
-               b->flags & V4L2_BUF_FLAG_LAST)
-               q->last_buffer_dequeued = true;
 }
 
 /*
@@ -786,6 +781,11 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)
 
        ret = vb2_core_dqbuf(q, NULL, b, nonblocking);
 
+       if (!q->is_output &&
+           b->flags & V4L2_BUF_FLAG_DONE &&
+           b->flags & V4L2_BUF_FLAG_LAST)
+               q->last_buffer_dequeued = true;
+
        /*
         *  After calling the VIDIOC_DQBUF V4L2_BUF_FLAG_DONE must be
         *  cleared.