Commit 999a4312 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ioctl: call v4l_pix_format_touch() for TRY_FMT 



The function v4l_pix_format_touch() is called for S_FMT to set
v4l2_pix_format fields to default values for a v4l-touch device,
but it wasn't called for TRY_FMT. Add this.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent ebe15c76

drivers/media/v4l2-core/v4l2-ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -1663,6 +1663,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
				struct file *file, void *fh, void *arg)

{

	struct v4l2_format *p = arg;

	struct video_device *vfd = video_devdata(file);

	int ret = check_fmt(file, p->type);

	unsigned int i;
@@ -1679,6 +1680,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
		ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);

		/* just in case the driver zeroed it again */

		p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;

		if (vfd->vfl_type == VFL_TYPE_TOUCH)

			v4l_pix_format_touch(&p->fmt.pix);

		return ret;

	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:

		if (unlikely(!ops->vidioc_try_fmt_vid_cap_mplane))