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

[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>
This commit is contained in:
Hans Verkuil 2015-07-20 10:09:32 -03:00 committed by Mauro Carvalho Chehab
parent 7fe0b3d7c7
commit 9acc809328
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/fsl-viu.c
View File

@ -581,7 +581,7 @@ static int vidioc_enum_fmt(struct file *file, void *priv,
{ {
int index = f->index; int index = f->index;
if (f->index > NUM_FORMATS) if (f->index >= NUM_FORMATS)
return -EINVAL; return -EINVAL;
strlcpy(f->description, formats[index].name, sizeof(f->description)); 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.width &= ~0x03;
f->fmt.pix.bytesperline = f->fmt.pix.bytesperline =
(f->fmt.pix.width * fmt->depth) >> 3; (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; f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
return 0; return 0;
@ -958,7 +959,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
{ {
struct viu_fh *fh = priv; struct viu_fh *fh = priv;
if (i > 1) if (i)
return -EINVAL; return -EINVAL;
decoder_call(fh->dev, video, s_routing, i, 0, 0); decoder_call(fh->dev, video, s_routing, i, 0, 0);