Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3fae817 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera_v2: Populate timecode type in vb2_v4l2_buffer"

parents 2d6666fa 6a9a399e

drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c

+2 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int msm_vb2_put_buf(struct vb2_v4l2_buffer *vb, int session_id, 


static int msm_vb2_buf_done(struct vb2_v4l2_buffer *vb, int session_id,

				unsigned int stream_id, uint32_t sequence,

				struct timeval *ts, uint32_t reserved)

				struct timeval *ts, uint32_t buf_type)

{

	unsigned long flags, rl_flags;

	struct msm_vb2_buffer *msm_vb2;
@@ -441,6 +441,7 @@ static int msm_vb2_buf_done(struct vb2_v4l2_buffer *vb, int session_id, 
		/* put buf before buf done */

		if (msm_vb2->in_freeq) {

			vb2_v4l2_buf->sequence = sequence;

			vb2_v4l2_buf->timecode.type = buf_type;

			vb2_v4l2_buf->vb2_buf.timestamp =

				(ts->tv_sec * 1000000 + ts->tv_usec) * 1000;

			vb2_buffer_done(&vb2_v4l2_buf->vb2_buf,