summaryrefslogtreecommitdiff
path: root/drivers/media/platform/mx2_emmaprp.c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-02-08 17:21:35 (GMT)
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-05 19:47:15 (GMT)
commit309f4d62eda0e864c2d4eef536cc82e41931c3c5 (patch)
treed5750f1dce1f46da1c35935cc02d344c3d4b4899 /drivers/media/platform/mx2_emmaprp.c
parent599b08929efe9b90e44b504454218a120bb062a0 (diff)
downloadlinux-309f4d62eda0e864c2d4eef536cc82e41931c3c5.tar.xz
[media] v4l: Copy timestamp source flags to destination on m2m devices
Copy the flags containing the timestamp source from source buffer flags to the destination buffer flags on memory-to-memory devices. This is analogous to copying the timestamp field from source to destination. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/mx2_emmaprp.c')
-rw-r--r--drivers/media/platform/mx2_emmaprp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 6debb02..0b7480e 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -378,6 +378,11 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)
dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+ dst_vb->v4l2_buf.flags &=
+ ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+ dst_vb->v4l2_buf.flags |=
+ src_vb->v4l2_buf.flags
+ & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
spin_lock_irqsave(&pcdev->irqlock, flags);