From a88038a456266cf9ff67c66983c126503c356d74 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 17 Feb 2012 02:43:27 -0300 Subject: [PATCH] --- yaml --- r: 295017 b: refs/heads/master c: 6c61ac635535bbabf4f374df171372d012b0e822 h: refs/heads/master i: 295015: 1e2067bb8b2a3ff33b5e1bbeb832b37e9f4c3e36 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s2255drv.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 294e32d49b12..1f42c518606b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da0af4788c4e992bf8085b8f585b0fa9c69970fa +refs/heads/master: 6c61ac635535bbabf4f374df171372d012b0e822 diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c index c1bef6187661..350524246ce0 100644 --- a/trunk/drivers/media/video/s2255drv.c +++ b/trunk/drivers/media/video/s2255drv.c @@ -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;