Skip to content

Commit

Permalink
V4L/DVB (10819): gspca: Don't need to zero ioctl parameter fields
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Trent Piepho authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 3836725 commit c6a976e
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c6a976e

Please sign in to comment.