1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 61f3dbcc259f..3e5199ee5d25 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -2428,7 +2428,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &coda_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         ret = vb2_queue_init(src_vq);
         if (ret)
@@ -2440,7 +2440,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &coda_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         return vb2_queue_init(dst_vq);
 }
@@ -2829,6 +2829,9 @@ static void coda_finish_encode(struct coda_ctx *ctx)
         }
 
         dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp;
+        dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+        dst_buf->v4l2_buf.flags |=
+                src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
         dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode;
 
         v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);