aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@linuxtv.org>2009-03-15 16:38:47 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:27 -0400
commitc888923debf8c8a799629f77d07aeb0f8350c87b (patch)
treec488bb1be03cfcd49655e1399831b0d0df72d38d /drivers/media/video
parente13ce79734348610a2b782cb818db65659b0dc83 (diff)
V4L/DVB (11082): au0828: remove memset calls in v4l2 routines.
The userland callers are responsible for clearing the output buffers, so remove the unneeded memset calls. Thanks to Mauro Carvalho Chehab <mchehab@infradead.org> for pointing this out. Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/au0828/au0828-video.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index f6e8cb17445b..96895117a0ce 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -1018,7 +1018,6 @@ static int vidioc_querycap(struct file *file, void *priv,
1018 struct au0828_fh *fh = priv; 1018 struct au0828_fh *fh = priv;
1019 struct au0828_dev *dev = fh->dev; 1019 struct au0828_dev *dev = fh->dev;
1020 1020
1021 memset(cap, 0, sizeof(*cap));
1022 strlcpy(cap->driver, "au0828", sizeof(cap->driver)); 1021 strlcpy(cap->driver, "au0828", sizeof(cap->driver));
1023 strlcpy(cap->card, dev->board.name, sizeof(cap->card)); 1022 strlcpy(cap->card, dev->board.name, sizeof(cap->card));
1024 strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); 1023 strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info));
@@ -1043,14 +1042,12 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
1043 if(f->index) 1042 if(f->index)
1044 return -EINVAL; 1043 return -EINVAL;
1045 1044
1046 memset(f, 0, sizeof(*f));
1047 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 1045 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
1048 strcpy(f->description, "Packed YUV2"); 1046 strcpy(f->description, "Packed YUV2");
1049 1047
1050 f->flags = 0; 1048 f->flags = 0;
1051 f->pixelformat = V4L2_PIX_FMT_UYVY; 1049 f->pixelformat = V4L2_PIX_FMT_UYVY;
1052 1050
1053 memset(f->reserved, 0, sizeof(f->reserved));
1054 return 0; 1051 return 0;
1055} 1052}
1056 1053
@@ -1139,7 +1136,6 @@ static int vidioc_enum_input(struct file *file, void *priv,
1139 if(AUVI_INPUT(tmp).type == 0) 1136 if(AUVI_INPUT(tmp).type == 0)
1140 return -EINVAL; 1137 return -EINVAL;
1141 1138
1142 memset(input, 0, sizeof(*input));
1143 input->index = tmp; 1139 input->index = tmp;
1144 strcpy(input->name, inames[AUVI_INPUT(tmp).type]); 1140 strcpy(input->name, inames[AUVI_INPUT(tmp).type]);
1145 if((AUVI_INPUT(tmp).type == AU0828_VMUX_TELEVISION) || 1141 if((AUVI_INPUT(tmp).type == AU0828_VMUX_TELEVISION) ||
@@ -1237,7 +1233,6 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
1237 if(a->index > 1) 1233 if(a->index > 1)
1238 return -EINVAL; 1234 return -EINVAL;
1239 1235
1240 memset(a, 0, sizeof(*a));
1241 index = dev->ctrl_ainput; 1236 index = dev->ctrl_ainput;
1242 if(index == 0) 1237 if(index == 0)
1243 strcpy(a->name, "Television"); 1238 strcpy(a->name, "Television");
@@ -1286,7 +1281,6 @@ static int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
1286 if(t->index != 0) 1281 if(t->index != 0)
1287 return -EINVAL; 1282 return -EINVAL;
1288 1283
1289 memset(t, 0, sizeof(*t));
1290 strcpy(t->name, "Auvitek tuner"); 1284 strcpy(t->name, "Auvitek tuner");
1291 1285
1292 au0828_call_i2c_clients(dev, VIDIOC_G_TUNER, t); 1286 au0828_call_i2c_clients(dev, VIDIOC_G_TUNER, t);
@@ -1315,7 +1309,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
1315{ 1309{
1316 struct au0828_fh *fh = priv; 1310 struct au0828_fh *fh = priv;
1317 struct au0828_dev *dev = fh->dev; 1311 struct au0828_dev *dev = fh->dev;
1318 memset(freq, 0, sizeof(*freq)); 1312
1319 freq->type = V4L2_TUNER_ANALOG_TV; 1313 freq->type = V4L2_TUNER_ANALOG_TV;
1320 freq->frequency = dev->ctrl_freq; 1314 freq->frequency = dev->ctrl_freq;
1321 return 0; 1315 return 0;