lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (7946): videodev: small fixes for VIDIOC_G_FREQUENCY and VIDIOC_G_FMT

Browse Source 
__video_do_ioctl incorrectly zeroed the tuner field of v4l2_frequency and
did not zero the full fmt union of v4l2_format.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
2008-05-27 21:32:08 -03:00
committed by Mauro Carvalho Chehab
parent 1d0ba5f378
commit 7bb846afce
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/video/videodev.c
View File

@@ -883,16 +883,13 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
case VIDIOC_G_FMT: case VIDIOC_G_FMT:
{ {
struct v4l2_format *f = (struct v4l2_format *)arg; struct v4l2_format *f = (struct v4l2_format *)arg;
enum v4l2_buf_type type=f->type;
memset(&f->fmt.pix,0,sizeof(f->fmt.pix)); memset(f->fmt.raw_data, 0, sizeof(f->fmt.raw_data));
f->type=type;
/* FIXME: Should be one dump per type */ /* FIXME: Should be one dump per type */
dbgarg (cmd, "type=%s\n", prt_names(type, dbgarg(cmd, "type=%s\n", prt_names(f->type, v4l2_type_names));
v4l2_type_names));
switch (type) { switch (f->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: case V4L2_BUF_TYPE_VIDEO_CAPTURE:
if (vfd->vidioc_g_fmt_cap) if (vfd->vidioc_g_fmt_cap)
ret=vfd->vidioc_g_fmt_cap(file, fh, f); ret=vfd->vidioc_g_fmt_cap(file, fh, f);
@@ -1688,16 +1685,17 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
} }
case VIDIOC_G_FREQUENCY: case VIDIOC_G_FREQUENCY:
{ {
struct v4l2_frequency *p=arg; struct v4l2_frequency *p = arg;
if (!vfd->vidioc_g_frequency) if (!vfd->vidioc_g_frequency)
break; break;
memset(p,0,sizeof(*p)); memset(p->reserved, 0, sizeof(p->reserved));
ret=vfd->vidioc_g_frequency(file, fh, p); ret = vfd->vidioc_g_frequency(file, fh, p);
if (!ret) if (!ret)
dbgarg (cmd, "tuner=%d, type=%d, frequency=%d\n", dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",
p->tuner,p->type,p->frequency); p->tuner, p->type, p->frequency);
break; break;
} }
case VIDIOC_S_FREQUENCY: case VIDIOC_S_FREQUENCY: