[media] s2255drv: cleanup vidioc_enum_fmt_cap()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 17 Feb 2012 05:43:27 +0000 (02:43 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 8 Mar 2012 13:39:56 +0000 (10:39 -0300)
"f" wasn't checked consistently, so static checkers complain.  This
function is always called with a valid "f" pointer, so I have removed
the check.

Also the indenting was messed up.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/s2255drv.c

index c1bef61876610e7ebb961c8ff11c76b986485bf5..350524246ce02fe09b6229a88b84625dbf9f19bc 100644 (file)
@@ -852,15 +852,13 @@ 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 = 0;
-       if (f)
-               index = f->index;
+       int index = f->index;
 
        if (index >= ARRAY_SIZE(formats))
                return -EINVAL;
-    if (!jpeg_enable && ((formats[index].fourcc == V4L2_PIX_FMT_JPEG) ||
-                        (formats[index].fourcc == V4L2_PIX_FMT_MJPEG)))
-       return -EINVAL;
+       if (!jpeg_enable && ((formats[index].fourcc == V4L2_PIX_FMT_JPEG) ||
+                       (formats[index].fourcc == V4L2_PIX_FMT_MJPEG)))
+               return -EINVAL;
        dprintk(4, "name %s\n", formats[index].name);
        strlcpy(f->description, formats[index].name, sizeof(f->description));
        f->pixelformat = formats[index].fourcc;