luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (8083): videodev: zero fields for ENCODER_CMD and VIDIOC_G_SLICED_VBI_CAP

Browse Source 
This avoids the need of memsets in the ivtv/cx18 drivers.

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-06-21 08:57:42 -03:00 committed by Mauro Carvalho Chehab
parent 3b6fe58f0f
commit 8bfb9b1ce6
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1616,26 +1616,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:
@ -1738,12 +1738,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: