commit 69ca0333e2486472e1738b4513e07bd768205f1c
author Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com> Thu Oct 01 09:03:31 2015 -0300
committer Mauro Carvalho Chehab <mchehab@osg.samsung.com> Thu Nov 19 08:03:47 2015 -0200
tree dff419e7a99b4ca2e6c2c67502590382490266e0
parent d01b2d53a5a4db38c7c95651ca9ff23bb930844e

[media] V4L2: platform: rcar_jpu: remove redundant code

Remove redundant code. Following code line do what we want.

[mchehab@osg.samsung.com: fix conflict with VB2 split patches that renamed some structs]
Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

drivers/media/platform/rcar_jpu.c

diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index f8e3e83..644f9f4 100644
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -1563,9 +1563,6 @@
 		dst_buf->timestamp = src_buf->timestamp;
 		if (src_buf->flags & V4L2_BUF_FLAG_TIMECODE)
 			dst_buf->timecode = src_buf->timecode;
-		dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-		dst_buf->flags |= src_buf->flags &
-					V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
 		dst_buf->flags = src_buf->flags &
 			(V4L2_BUF_FLAG_TIMECODE | V4L2_BUF_FLAG_KEYFRAME |
 			 V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME |