From: Mikhail Ulyanov Date: Thu, 1 Oct 2015 12:03:31 +0000 (-0300) Subject: [media] V4L2: platform: rcar_jpu: remove redundant code X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69ca0333e2486472e1738b4513e07bd768205f1c;p=linux-beck.git [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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c index f8e3e83c52a2..644f9f4907f4 100644 --- a/drivers/media/platform/rcar_jpu.c +++ b/drivers/media/platform/rcar_jpu.c @@ -1563,9 +1563,6 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id) 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 |