From: Philipp Zabel Date: Tue, 18 Jun 2019 16:45:09 +0000 (-0400) Subject: media: coda: use mem2mem try_en/decoder_cmd helpers X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f66a607d73389263694c9d597bcf8d36ffe3b12d;p=openwrt%2Fstaging%2Fblogic.git media: coda: use mem2mem try_en/decoder_cmd helpers Use mem2mem try_en/decoder_cmd helpers to ensure consistent behaviour with other video codec drivers. Signed-off-by: Philipp Zabel Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index c7dcab4d1f6c..8347169fadc0 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -1001,13 +1001,7 @@ static int coda_try_encoder_cmd(struct file *file, void *fh, if (ctx->inst_type != CODA_INST_ENCODER) return -ENOTTY; - if (ec->cmd != V4L2_ENC_CMD_STOP) - return -EINVAL; - - if (ec->flags & V4L2_ENC_CMD_STOP_AT_GOP_END) - return -EINVAL; - - return 0; + return v4l2_m2m_ioctl_try_encoder_cmd(file, fh, ec); } static int coda_encoder_cmd(struct file *file, void *fh, @@ -1043,16 +1037,7 @@ static int coda_try_decoder_cmd(struct file *file, void *fh, if (ctx->inst_type != CODA_INST_DECODER) return -ENOTTY; - if (dc->cmd != V4L2_DEC_CMD_STOP) - return -EINVAL; - - if (dc->flags & V4L2_DEC_CMD_STOP_TO_BLACK) - return -EINVAL; - - if (!(dc->flags & V4L2_DEC_CMD_STOP_IMMEDIATELY) && (dc->stop.pts != 0)) - return -EINVAL; - - return 0; + return v4l2_m2m_ioctl_try_decoder_cmd(file, fh, dc); } static int coda_decoder_cmd(struct file *file, void *fh,