From: Hans Verkuil <hverkuil@xs4all.nl>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Florian Echtler <floe@butterbrot.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Nick Dyer <nick@shmanahar.org>,
Lucas Stach <l.stach@pengutronix.de>,
Nick Dyer <nick.dyer@itdev.co.uk>
Subject: [PATCH] v4l2-ioctl: call v4l_pix_format_touch() for TRY_FMT
Date: Wed, 26 Jun 2019 11:48:18 +0200 [thread overview]
Message-ID: <95437142-2935-0d3f-073e-333dab4e17c0@xs4all.nl> (raw)
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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index b1f4b991dba6..c5c8c8ab7cf6 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1661,6 +1661,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))
next reply other threads:[~2019-06-26 9:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 9:48 Hans Verkuil [this message]
2019-06-26 15:07 ` [PATCH] v4l2-ioctl: call v4l_pix_format_touch() for TRY_FMT Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=95437142-2935-0d3f-073e-333dab4e17c0@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=floe@butterbrot.org \
--cc=l.stach@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=nick.dyer@itdev.co.uk \
--cc=nick@shmanahar.org \
--cc=p.zabel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.