Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161534AbWJKVwK (ORCPT ); Wed, 11 Oct 2006 17:52:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161535AbWJKVwK (ORCPT ); Wed, 11 Oct 2006 17:52:10 -0400 Received: from kurby.webscope.com ([204.141.84.54]:48294 "EHLO kirby.webscope.com") by vger.kernel.org with ESMTP id S1161534AbWJKVwF (ORCPT ); Wed, 11 Oct 2006 17:52:05 -0400 Message-ID: <452D6703.7070900@linuxtv.org> Date: Wed, 11 Oct 2006 17:49:55 -0400 From: Michael Krufky User-Agent: Thunderbird 1.5.0.7 (Windows/20060909) MIME-Version: 1.0 To: Jonathan Corbet CC: Greg KH , Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , akpm@osdl.org, alan@lxorguk.ukuu.org.uk, mchehab@infradead.org, linux-kernel@vger.kernel.org, stable@kernel.org, torvalds@osdl.org, Sascha Hauer , Mauro Carvalho Chehab Subject: Re: [patch 48/67] Fix VIDIOC_ENUMSTD bug References: <10090.1160603175@lwn.net> In-Reply-To: <10090.1160603175@lwn.net> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1966 Lines: 59 Jonathan Corbet wrote: >> So any application which passes in index=0 gets EINVAL right off the bat >> - and, in fact, this is what happens to mplayer. So I think the >> following patch is called for, and maybe even appropriate for a 2.6.18.x >> stable release. > > The fix is worth having, though I guess I'm no longer 100% sure it's > necessary for -stable, since I don't think anything in-tree other than > vivi uses this interface in 2.6.18. If you are going to include it, > though, it makes sense to put in Sascha's fix too - both are needed to > make the new v4l2 ioctl() interface operate as advertised. > > jon > > > From: Sascha Hauer > Subject: [PATCH] copy-paste bug in videodev.c > Date: Mon, 11 Sep 2006 10:50:55 +0200 > To: video4linux-list@redhat.com > > This patch fixes a copy-paste bug in videodev.c where the vidioc_qbuf() > function gets called for the dqbuf ioctl. > > Signed-off-by: Sascha Hauer > > diff --git a/drivers/media/video/videodev.c > b/drivers/media/video/videodev.c > index 88bf2af..8abee33 100644 > --- a/drivers/media/video/videodev.c > +++ b/drivers/media/video/videodev.c > @@ -739,13 +739,13 @@ static int __video_do_ioctl(struct inode > case VIDIOC_DQBUF: > { > struct v4l2_buffer *p=arg; > - if (!vfd->vidioc_qbuf) > + if (!vfd->vidioc_dqbuf) > break; > ret = check_fmt (vfd, p->type); > if (ret) > break; > > - ret=vfd->vidioc_qbuf(file, fh, p); > + ret=vfd->vidioc_dqbuf(file, fh, p); > if (!ret) > dbgbuf(cmd,vfd,p); > break; > > This is fine with me... I have added cc to Mauro, he might want to add his sign-off as well. Signed-off-by: Michael Krufky - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/