1 files changed, 4 insertions, 23 deletions

diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index bfe25841dbf4..b02944d38932 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1198,21 +1198,16 @@ static int vidioc_enum_input(struct file *file, void *priv,
         struct cx23885_fh  *fh  = file->private_data;
         struct cx23885_dev *dev = fh->dev;
         struct cx23885_input *input;
-        unsigned int n;
+        int n;
 
-        n = i->index;
-
-        if (n >= 4)
+        if (i->index >= 4)
                 return -EINVAL;
 
-        input = &cx23885_boards[dev->board].input[n];
+        input = &cx23885_boards[dev->board].input[i->index];
 
         if (input->type == 0)
                 return -EINVAL;
 
-        memset(i, 0, sizeof(*i));
-        i->index = n;
-
         /* FIXME
          * strcpy(i->name, input->name); */
         strcpy(i->name, "unset");
@@ -1255,7 +1250,6 @@ static int vidioc_g_tuner(struct file *file, void *priv,
                 return -EINVAL;
         if (0 != t->index)
                 return -EINVAL;
-        memset(t, 0, sizeof(*t));
         strcpy(t->name, "Television");
         cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_TUNER, t);
         cx23885_call_i2c_clients(&dev->i2c_bus[1], VIDIOC_G_TUNER, t);
@@ -1286,7 +1280,6 @@ static int vidioc_g_frequency(struct file *file, void *priv,
         struct cx23885_fh  *fh  = file->private_data;
         struct cx23885_dev *dev = fh->dev;
 
-        memset(f, 0, sizeof(*f));
         if (UNSET == dev->tuner_type)
                 return -EINVAL;
         f->type = V4L2_TUNER_ANALOG_TV;
@@ -1346,7 +1339,6 @@ static int vidioc_querycap(struct file *file, void  *priv,
         struct cx23885_dev *dev = fh->dev;
         struct cx23885_tsport  *tsport = &dev->ts1;
 
-        memset(cap, 0, sizeof(*cap));
         strcpy(cap->driver, dev->name);
         strlcpy(cap->card, cx23885_boards[tsport->dev->board].name,
                 sizeof(cap->card));
@@ -1366,16 +1358,10 @@ static int vidioc_querycap(struct file *file, void  *priv,
 static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
                                         struct v4l2_fmtdesc *f)
 {
-        int index;
-
-        index = f->index;
-        if (index != 0)
+        if (f->index != 0)
                 return -EINVAL;
 
-        memset(f, 0, sizeof(*f));
-        f->index = index;
         strlcpy(f->description, "MPEG", sizeof(f->description));
-        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         f->pixelformat = V4L2_PIX_FMT_MPEG;
 
         return 0;
@@ -1387,8 +1373,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
         struct cx23885_fh  *fh  = file->private_data;
         struct cx23885_dev *dev = fh->dev;
 
-        memset(f, 0, sizeof(*f));
-        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
         f->fmt.pix.sizeimage    =
@@ -1408,12 +1392,10 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
         struct cx23885_fh  *fh  = file->private_data;
         struct cx23885_dev *dev = fh->dev;
 
-        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
         f->fmt.pix.sizeimage    =
                 dev->ts1.ts_packet_size * dev->ts1.ts_packet_count;
-        f->fmt.pix.sizeimage    =
         f->fmt.pix.colorspace   = 0;
         dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n",
                 dev->ts1.width, dev->ts1.height, fh->mpegq.field);
@@ -1426,7 +1408,6 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         struct cx23885_fh  *fh  = file->private_data;
         struct cx23885_dev *dev = fh->dev;
 
-        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
         f->fmt.pix.sizeimage    =