forked from Minki/linux
V4L/DVB (10819): gspca: 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 g_audio, enum_input, g_parm and gmbuf. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
3836725518
commit
c6a976e44e
@ -1099,7 +1099,6 @@ static int vidioc_s_audio(struct file *file, void *priv,
|
||||
static int vidioc_g_audio(struct file *file, void *priv,
|
||||
struct v4l2_audio *audio)
|
||||
{
|
||||
memset(audio, 0, sizeof *audio);
|
||||
strcpy(audio->name, "Microphone");
|
||||
return 0;
|
||||
}
|
||||
@ -1133,7 +1132,6 @@ static int vidioc_enum_input(struct file *file, void *priv,
|
||||
|
||||
if (input->index != 0)
|
||||
return -EINVAL;
|
||||
memset(input, 0, sizeof *input);
|
||||
input->type = V4L2_INPUT_TYPE_CAMERA;
|
||||
strncpy(input->name, gspca_dev->sd_desc->name,
|
||||
sizeof input->name);
|
||||
@ -1341,7 +1339,6 @@ static int vidioc_g_parm(struct file *filp, void *priv,
|
||||
{
|
||||
struct gspca_dev *gspca_dev = priv;
|
||||
|
||||
memset(parm, 0, sizeof *parm);
|
||||
parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
parm->parm.capture.readbuffers = gspca_dev->nbufread;
|
||||
|
||||
@ -1411,7 +1408,6 @@ static int vidiocgmbuf(struct file *file, void *priv,
|
||||
{
|
||||
struct v4l2_format fmt;
|
||||
|
||||
memset(&fmt, 0, sizeof fmt);
|
||||
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
i = gspca_dev->cam.nmodes - 1; /* highest mode */
|
||||
fmt.fmt.pix.width = gspca_dev->cam.cam_mode[i].width;
|
||||
|
Loading…
Reference in New Issue
Block a user