mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-16 14:02:10 +00:00
V4L/DVB (8526): saa7146: fix VIDIOC_ENUM_FMT
VIDIOC_ENUM_FMT should keep the index and type fields. Instead, type was zeroed. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
de1e575db2
commit
f796804f01
@ -958,21 +958,18 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
|
||||
case VIDIOC_ENUM_FMT:
|
||||
{
|
||||
struct v4l2_fmtdesc *f = arg;
|
||||
int index;
|
||||
|
||||
switch (f->type) {
|
||||
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
|
||||
case V4L2_BUF_TYPE_VIDEO_OVERLAY: {
|
||||
index = f->index;
|
||||
if (index < 0 || index >= NUM_FORMATS) {
|
||||
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
|
||||
if (f->index >= NUM_FORMATS)
|
||||
return -EINVAL;
|
||||
}
|
||||
memset(f,0,sizeof(*f));
|
||||
f->index = index;
|
||||
strlcpy((char *)f->description,formats[index].name,sizeof(f->description));
|
||||
f->pixelformat = formats[index].pixelformat;
|
||||
strlcpy((char *)f->description, formats[f->index].name,
|
||||
sizeof(f->description));
|
||||
f->pixelformat = formats[f->index].pixelformat;
|
||||
f->flags = 0;
|
||||
memset(f->reserved, 0, sizeof(f->reserved));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user