From: Hans Verkuil <hverkuil@xs4all.nl>
To: linux-media@vger.kernel.org
Cc: Anatolij Gustschin <agust@denx.de>,
Hans Verkuil <hans.verkuil@cisco.com>
Subject: [PATCH 5/6] fsl-viu: small fixes.
Date: Mon, 20 Jul 2015 15:09:32 +0200 [thread overview]
Message-ID: <1437397773-5752-6-git-send-email-hverkuil@xs4all.nl> (raw)
In-Reply-To: <1437397773-5752-1-git-send-email-hverkuil@xs4all.nl>
From: Hans Verkuil <hans.verkuil@cisco.com>
- Fix an off-by-one index check in vidioc_enum_fmt()
- Fill in the pix.sizeimage field in vidioc_try_fmt_cap()
- Fix an off-by-one index check in vidioc_s_input()
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/platform/fsl-viu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index 906442e..69ee2b6 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -581,7 +581,7 @@ static int vidioc_enum_fmt(struct file *file, void *priv,
{
int index = f->index;
- if (f->index > NUM_FORMATS)
+ if (f->index >= NUM_FORMATS)
return -EINVAL;
strlcpy(f->description, formats[index].name, sizeof(f->description));
@@ -633,6 +633,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv,
f->fmt.pix.width &= ~0x03;
f->fmt.pix.bytesperline =
(f->fmt.pix.width * fmt->depth) >> 3;
+ f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
return 0;
@@ -958,7 +959,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
{
struct viu_fh *fh = priv;
- if (i > 1)
+ if (i)
return -EINVAL;
decoder_call(fh->dev, video, s_routing, i, 0, 0);
--
2.1.4
next prev parent reply other threads:[~2015-07-20 13:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 13:09 [PATCH 0/6] fsl-viu: convert to the control framework Hans Verkuil
2015-07-20 13:09 ` [PATCH 1/6] " Hans Verkuil
2015-07-20 13:09 ` [PATCH 2/6] fsl-viu: fill in bus_info in vidioc_querycap Hans Verkuil
2015-07-20 13:09 ` [PATCH 3/6] fsl-viu: fill in colorspace, always set field to interlaced Hans Verkuil
2015-07-20 13:09 ` [PATCH 4/6] fsl-viu: add control event support Hans Verkuil
2015-07-20 13:09 ` Hans Verkuil [this message]
2015-07-20 13:09 ` [PATCH 6/6] fsl-viu: drop format names Hans Verkuil
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=1437397773-5752-6-git-send-email-hverkuil@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=agust@denx.de \
--cc=hans.verkuil@cisco.com \
--cc=linux-media@vger.kernel.org \
/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.