p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media: allegro: use new v4l2_m2m_ioctl_try_encoder_cmd funcs 

As the try_encoder_cmd is identical for many drivers, there are now
helpers for this function in the mem2mem core. Use the helper in
allegro.

This fixes the v4l2-compliance test regarding V4L2_ENC_CMD_STOP, because
the allegro-specific function rejected invalid flags.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Michael Tretter 2019-06-25 10:13:20 -04:00 committed by Mauro Carvalho Chehab
parent 46fb474978
commit f81cbfc4f8
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/media/allegro-dvt/allegro-core.c
View File

@ -2508,24 +2508,6 @@ static int allegro_s_fmt_vid_out(struct file *file, void *fh,
return 0;
}
static int allegro_try_encoder_cmd(struct file *file, void *fh,
struct v4l2_encoder_cmd *cmd)
{
switch (cmd->cmd) {
case V4L2_ENC_CMD_START:
cmd->flags = 0;
break;
case V4L2_ENC_CMD_STOP:
if (cmd->flags)
return -EINVAL;
break;
default:
return -EINVAL;
}
return 0;
}
static int allegro_channel_cmd_stop(struct allegro_channel *channel)
{
struct allegro_dev *dev = channel->dev;
@ -2594,7 +2576,7 @@ static int allegro_encoder_cmd(struct file *file, void *fh,
struct allegro_channel *channel = fh_to_channel(fh);
int err;
err = allegro_try_encoder_cmd(file, fh, cmd);
err = v4l2_m2m_ioctl_try_encoder_cmd(file, fh, cmd);
if (err)
return err;
@ -2688,7 +2670,7 @@ static const struct v4l2_ioctl_ops allegro_ioctl_ops = {
.vidioc_streamon = allegro_ioctl_streamon,
.vidioc_streamoff = v4l2_m2m_ioctl_streamoff,
.vidioc_try_encoder_cmd = allegro_try_encoder_cmd,
.vidioc_try_encoder_cmd = v4l2_m2m_ioctl_try_encoder_cmd,
.vidioc_encoder_cmd = allegro_encoder_cmd,
.vidioc_enum_framesizes = allegro_enum_framesizes,