diff options
| author | Hans Verkuil | 2015-07-20 15:09:32 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-08-11 11:58:41 +0200 |
| commit | 9acc8093282456f920f7d3e34b0b1b58c3f07dbd (patch) | |
| tree | 9857efe0d25a73ddf97a8328c72301f5d5dde647 /drivers/media | |
| parent | [media] fsl-viu: add control event support (diff) | |
| download | kernel-qcow2-linux-9acc8093282456f920f7d3e34b0b1b58c3f07dbd.tar.gz kernel-qcow2-linux-9acc8093282456f920f7d3e34b0b1b58c3f07dbd.tar.xz kernel-qcow2-linux-9acc8093282456f920f7d3e34b0b1b58c3f07dbd.zip | |
[media] fsl-viu: small fixes
- 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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/fsl-viu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 906442ecd518..69ee2b6c2ffc 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); |