From mboxrd@z Thu Jan 1 00:00:00 1970 From: dean anderson Date: Fri, 17 Feb 2012 23:14:42 +0000 Subject: Re: [patch 1/2] [media] s2255drv: cleanup vidioc_enum_fmt_cap() Message-Id: <4F3EDF62.9090005@sensoray.com> List-Id: References: <20120217064327.GA3666@elgon.mountain> In-Reply-To: <20120217064327.GA3666@elgon.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: Mauro Carvalho Chehab , Dean Anderson , Hans Verkuil , Pete Eberlein , linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Thanks Dan, I can sign off on this. The check isn't required. Signed-off-by: Dean Anderson On 2/16/2012 10:43 PM, Dan Carpenter wrote: > "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 > > diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c > index c1bef61..3505242 100644 > --- a/drivers/media/video/s2255drv.c > +++ b/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; > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >