diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 10:57:42 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 10:57:42 +0200 |
| commit | 20086b387b880f279de1671dfb6b12b72849193e (patch) | |
| tree | 2bca05cd4ff4a747d7e196e1e1c02c1fad73f6ec /linux/drivers | |
| parent | b851841e48464de8b2e00d37754a09a2d0d4aec5 (diff) | |
| download | mediapointer-dvb-s2-20086b387b880f279de1671dfb6b12b72849193e.tar.gz mediapointer-dvb-s2-20086b387b880f279de1671dfb6b12b72849193e.tar.bz2 | |
videodev: zero fields for ENCODER_CMD and VIDIOC_G_SLICED_VBI_CAP
From: Hans Verkuil <hverkuil@xs4all.nl>
This avoids the need of memsets in the ivtv/cx18 drivers.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index d7059944b..a0ed3b051 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -1749,26 +1749,26 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, } case VIDIOC_ENCODER_CMD: { - struct v4l2_encoder_cmd *p=arg; + struct v4l2_encoder_cmd *p = arg; if (!vfd->vidioc_encoder_cmd) break; - ret=vfd->vidioc_encoder_cmd(file, fh, p); + memset(&p->raw, 0, sizeof(p->raw)); + ret = vfd->vidioc_encoder_cmd(file, fh, p); if (!ret) - dbgarg (cmd, "cmd=%d, flags=%d\n", - p->cmd,p->flags); + dbgarg(cmd, "cmd=%d, flags=%x\n", p->cmd, p->flags); break; } case VIDIOC_TRY_ENCODER_CMD: { - struct v4l2_encoder_cmd *p=arg; + struct v4l2_encoder_cmd *p = arg; if (!vfd->vidioc_try_encoder_cmd) break; - ret=vfd->vidioc_try_encoder_cmd(file, fh, p); + memset(&p->raw, 0, sizeof(p->raw)); + ret = vfd->vidioc_try_encoder_cmd(file, fh, p); if (!ret) - dbgarg (cmd, "cmd=%d, flags=%d\n", - p->cmd,p->flags); + dbgarg(cmd, "cmd=%d, flags=%x\n", p->cmd, p->flags); break; } case VIDIOC_G_PARM: @@ -1871,12 +1871,17 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, } case VIDIOC_G_SLICED_VBI_CAP: { - struct v4l2_sliced_vbi_cap *p=arg; + struct v4l2_sliced_vbi_cap *p = arg; + __u32 type = p->type; + if (!vfd->vidioc_g_sliced_vbi_cap) break; - ret=vfd->vidioc_g_sliced_vbi_cap(file, fh, p); + memset(p, 0, sizeof(*p)); + p->type = type; + ret = vfd->vidioc_g_sliced_vbi_cap(file, fh, p); if (!ret) - dbgarg (cmd, "service_set=%d\n", p->service_set); + dbgarg(cmd, "type=%d, service_set=%d\n", + p->type, p->service_set); break; } case VIDIOC_LOG_STATUS: |