提交 f3334bcb 编写于 作者: T Trent Piepho 提交者: Mauro Carvalho Chehab

V4L/DVB (10816): cx88: Don't need to zero ioctl parameter fields

The v4l2 core code in v4l2_ioctl will zero out the structure the driver is
supposed to fill in for read-only ioctls.  For read/write ioctls, all the
fields which aren't supplied from userspace will be zeroed out.

Zeroing code is removed from enum_input and g_tuner.
Signed-off-by: NTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 522a5f14
...@@ -1277,15 +1277,12 @@ int cx88_enum_input (struct cx88_core *core,struct v4l2_input *i) ...@@ -1277,15 +1277,12 @@ int cx88_enum_input (struct cx88_core *core,struct v4l2_input *i)
[ CX88_VMUX_DVB ] = "DVB", [ CX88_VMUX_DVB ] = "DVB",
[ CX88_VMUX_DEBUG ] = "for debug only", [ CX88_VMUX_DEBUG ] = "for debug only",
}; };
unsigned int n; unsigned int n = i->index;
n = i->index;
if (n >= 4) if (n >= 4)
return -EINVAL; return -EINVAL;
if (0 == INPUT(n).type) if (0 == INPUT(n).type)
return -EINVAL; return -EINVAL;
memset(i,0,sizeof(*i));
i->index = n;
i->type = V4L2_INPUT_TYPE_CAMERA; i->type = V4L2_INPUT_TYPE_CAMERA;
strcpy(i->name,iname[INPUT(n).type]); strcpy(i->name,iname[INPUT(n).type]);
if ((CX88_VMUX_TELEVISION == INPUT(n).type) || if ((CX88_VMUX_TELEVISION == INPUT(n).type) ||
...@@ -1521,7 +1518,6 @@ static int radio_g_audio (struct file *file, void *priv, struct v4l2_audio *a) ...@@ -1521,7 +1518,6 @@ static int radio_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
if (unlikely(a->index)) if (unlikely(a->index))
return -EINVAL; return -EINVAL;
memset(a,0,sizeof(*a));
strcpy(a->name,"Radio"); strcpy(a->name,"Radio");
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册