aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-03 23:21:03 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:06 -0400
commitc6a976e44ec37b93cbd62403971e9770ac60d389 (patch)
treea60a189466d7a1586c9ee6c47916a62036a47bea
parent38367255185408748c2d46641e06c83570af161c (diff)
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>
-rw-r--r--drivers/media/video/gspca/gspca.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 8aac7a1e8f33..ed18401fd8ba 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1099,7 +1099,6 @@ static int vidioc_s_audio(struct file *file, void *priv,
1099static int vidioc_g_audio(struct file *file, void *priv, 1099static int vidioc_g_audio(struct file *file, void *priv,
1100 struct v4l2_audio *audio) 1100 struct v4l2_audio *audio)
1101{ 1101{
1102 memset(audio, 0, sizeof *audio);
1103 strcpy(audio->name, "Microphone"); 1102 strcpy(audio->name, "Microphone");
1104 return 0; 1103 return 0;
1105} 1104}
@@ -1133,7 +1132,6 @@ static int vidioc_enum_input(struct file *file, void *priv,
1133 1132
1134 if (input->index != 0) 1133 if (input->index != 0)
1135 return -EINVAL; 1134 return -EINVAL;
1136 memset(input, 0, sizeof *input);
1137 input->type = V4L2_INPUT_TYPE_CAMERA; 1135 input->type = V4L2_INPUT_TYPE_CAMERA;
1138 strncpy(input->name, gspca_dev->sd_desc->name, 1136 strncpy(input->name, gspca_dev->sd_desc->name,
1139 sizeof input->name); 1137 sizeof input->name);
@@ -1341,7 +1339,6 @@ static int vidioc_g_parm(struct file *filp, void *priv,
1341{ 1339{
1342 struct gspca_dev *gspca_dev = priv; 1340 struct gspca_dev *gspca_dev = priv;
1343 1341
1344 memset(parm, 0, sizeof *parm);
1345 parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 1342 parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
1346 parm->parm.capture.readbuffers = gspca_dev->nbufread; 1343 parm->parm.capture.readbuffers = gspca_dev->nbufread;
1347 1344
@@ -1411,7 +1408,6 @@ static int vidiocgmbuf(struct file *file, void *priv,
1411 { 1408 {
1412 struct v4l2_format fmt; 1409 struct v4l2_format fmt;
1413 1410
1414 memset(&fmt, 0, sizeof fmt);
1415 fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 1411 fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
1416 i = gspca_dev->cam.nmodes - 1; /* highest mode */ 1412 i = gspca_dev->cam.nmodes - 1; /* highest mode */
1417 fmt.fmt.pix.width = gspca_dev->cam.cam_mode[i].width; 1413 fmt.fmt.pix.width = gspca_dev->cam.cam_mode[i].width;