1 files changed, 3 insertions, 42 deletions

diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index b76e33d5c867..2ad11f0999c6 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1017,7 +1017,6 @@ static int meyeioc_stilljcapt(int *len)
 static int vidioc_querycap(struct file *file, void *fh,
                                 struct v4l2_capability *cap)
 {
-        memset(cap, 0, sizeof(*cap));
         strcpy(cap->driver, "meye");
         strcpy(cap->card, "meye");
         sprintf(cap->bus_info, "PCI:%s", pci_name(meye.mchip_dev));
@@ -1036,8 +1035,6 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i)
         if (i->index != 0)
                 return -EINVAL;
 
-        memset(i, 0, sizeof(*i));
-        i->index = 0;
         strcpy(i->name, "Camera");
         i->type = V4L2_INPUT_TYPE_CAMERA;
 
@@ -1259,22 +1256,13 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *fh,
         if (f->index > 1)
                 return -EINVAL;
 
-        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-
         if (f->index == 0) {
                 /* standard YUV 422 capture */
-                memset(f, 0, sizeof(*f));
-                f->index = 0;
-                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 f->flags = 0;
                 strcpy(f->description, "YUV422");
                 f->pixelformat = V4L2_PIX_FMT_YUYV;
         } else {
                 /* compressed MJPEG capture */
-                memset(f, 0, sizeof(*f));
-                f->index = 1;
-                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 f->flags = V4L2_FMT_FLAG_COMPRESSED;
                 strcpy(f->description, "MJPEG");
                 f->pixelformat = V4L2_PIX_FMT_MJPEG;
@@ -1286,9 +1274,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *fh,
 static int vidioc_try_fmt_vid_cap(struct file *file, void *fh,
                                 struct v4l2_format *f)
 {
-        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-
         if (f->fmt.pix.pixelformat != V4L2_PIX_FMT_YUYV &&
             f->fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)
                 return -EINVAL;
@@ -1319,12 +1304,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *fh,
 static int vidioc_g_fmt_vid_cap(struct file *file, void *fh,
                                     struct v4l2_format *f)
 {
-        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-
-        memset(&f->fmt.pix, 0, sizeof(struct v4l2_pix_format));
-        f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
         switch (meye.mchip_mode) {
         case MCHIP_HIC_MODE_CONT_OUT:
         default:
@@ -1341,8 +1320,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *fh,
         f->fmt.pix.bytesperline = f->fmt.pix.width * 2;
         f->fmt.pix.sizeimage = f->fmt.pix.height *
                                f->fmt.pix.bytesperline;
-        f->fmt.pix.colorspace = 0;
-        f->fmt.pix.priv = 0;
 
         return 0;
 }
@@ -1350,9 +1327,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *fh,
 static int vidioc_s_fmt_vid_cap(struct file *file, void *fh,
                                     struct v4l2_format *f)
 {
-        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-
         if (f->fmt.pix.pixelformat != V4L2_PIX_FMT_YUYV &&
             f->fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)
                 return -EINVAL;
@@ -1398,9 +1372,6 @@ static int vidioc_reqbufs(struct file *file, void *fh,
 {
         int i;
 
-        if (req->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-
         if (req->memory != V4L2_MEMORY_MMAP)
                 return -EINVAL;
 
@@ -1441,15 +1412,11 @@ static int vidioc_reqbufs(struct file *file, void *fh,
 
 static int vidioc_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
 {
-        int index = buf->index;
+        unsigned int index = buf->index;
 
-        if (index < 0 || index >= gbuffers)
+        if (index >= gbuffers)
                 return -EINVAL;
 
-        memset(buf, 0, sizeof(*buf));
-
-        buf->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        buf->index = index;
         buf->bytesused = meye.grab_buffer[index].size;
         buf->flags = V4L2_BUF_FLAG_MAPPED;
 
@@ -1471,13 +1438,10 @@ static int vidioc_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
 
 static int vidioc_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
 {
-        if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-
         if (buf->memory != V4L2_MEMORY_MMAP)
                 return -EINVAL;
 
-        if (buf->index < 0 || buf->index >= gbuffers)
+        if (buf->index >= gbuffers)
                 return -EINVAL;
 
         if (meye.grab_buffer[buf->index].state != MEYE_BUF_UNUSED)
@@ -1497,9 +1461,6 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
 {
         int reqnr;
 
-        if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-
         if (buf->memory != V4L2_MEMORY_MMAP)
                 return -EINVAL;