Commit dcbc216d authored Nov 03, 2015 by Junghak Sung Committed by Mauro Carvalho Chehab Dec 18, 2015

[media] media: videobuf2: last_buffer_queued is set at fill_v4l2_buffer()



The location in which last_buffer_queued is set is moved to fill_v4l2_buffer().
So, __vb2_perform_fileio() can use vb2_core_dqbuf() instead of
vb2_internal_dqbuf().

Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 49d8ab9f

drivers/media/v4l2-core/videobuf2-v4l2.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -270,6 +270,11 @@ static int __fill_v4l2_buffer(struct vb2_buffer vb, void pb)
		if (vb2_buffer_in_use(q, vb))
		b->flags \|= V4L2_BUF_FLAG_MAPPED;

		if (!q->is_output &&
		b->flags & V4L2_BUF_FLAG_DONE &&
		b->flags & V4L2_BUF_FLAG_LAST)
		q->last_buffer_dequeued = true;

		return 0;
		}

		@@ -617,10 +622,6 @@ static int vb2_internal_dqbuf(struct vb2_queue q, struct v4l2_buffer b,

		ret = vb2_core_dqbuf(q, b, nonblocking);

		if (!ret && !q->is_output &&
		b->flags & V4L2_BUF_FLAG_LAST)
		q->last_buffer_dequeued = true;

		return ret;
		}