Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759111AbYAFWzi (ORCPT ); Sun, 6 Jan 2008 17:55:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756993AbYAFWzb (ORCPT ); Sun, 6 Jan 2008 17:55:31 -0500 Received: from wa-out-1112.google.com ([209.85.146.176]:31417 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755600AbYAFWza (ORCPT ); Sun, 6 Jan 2008 17:55:30 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=SHj4556WeLu5mkKrpnVPzHgtP1XOzjsP/wMyocR3QQh9Zmi6lF52+HIG64bdi+QuhXnOinj+CCXbBbhQpbxsmtSIfn5b9Vi8BCC/p4NX3rSL6asVyJDc0TOIsF1cWTPS2VUgLt6xWQfuxAqb0nYt6A67uB7KgarG2I6cyazXm+I= Message-ID: <68cac7520801061455u3365644cp185664e5b095f920@mail.gmail.com> Date: Sun, 6 Jan 2008 20:55:29 -0200 From: "Douglas Landgraf" To: "Gregor Jasny" Subject: Re: [v4l-dvb-maintainer] [PATCH] Re: Regression: VIDIOCGMBUF ioctl hangs on bttv driver (2.6.24-rc6) Cc: linux-kernel@vger.kernel.org, video4linux-list , "Mauro Carvalho Chehab" , v4l-dvb-maintainer@linuxtv.org, "Rafael J. Wysocki" In-Reply-To: <68cac7520801061453w6906e510o5d53449e0b28f400@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20080105223338.GA18690@vidsoft.de> <20080106141548.GB18690@vidsoft.de> <68cac7520801061453w6906e510o5d53449e0b28f400@mail.gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2318 Lines: 62 I mean video_ioctl2 not vidioc_ioctl2, sorry. Cheers, Douglas On Jan 6, 2008 8:53 PM, Douglas Landgraf wrote: > Hi guys, > > Gregor, we have converted bttv driver to use vidioc_ioctl2 some days ago. > Could you check and create your patch against v4l development tree? > Bttv driver does not have anymore bttv_do_ioctl(). > > Cheers, > Douglas > > > On Jan 6, 2008 12:15 PM, Gregor Jasny wrote: > > From: Gregor Jasny > > > > Fix bttv VIDIOCGMBUF locking like done in commit > > 820eacd84cff23b76693f4be1e28feb672f4488f. > > > > Signed-off-by: Gregor Jasny > > --- > > diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c > > index c02d92d..581a3c9 100644 > > --- a/drivers/media/video/bt8xx/bttv-driver.c > > +++ b/drivers/media/video/bt8xx/bttv-driver.c > > @@ -3063,11 +3063,10 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, > > struct video_mbuf *mbuf = arg; > > unsigned int i; > > > > - mutex_lock(&fh->cap.lock); > > retval = videobuf_mmap_setup(&fh->cap,gbuffers,gbufsize, > > V4L2_MEMORY_MMAP); > > if (retval < 0) > > - goto fh_unlock_and_return; > > + return retval; > > > > gbuffers = retval; > > memset(mbuf,0,sizeof(*mbuf)); > > @@ -3075,7 +3074,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, > > mbuf->size = gbuffers * gbufsize; > > for (i = 0; i < gbuffers; i++) > > mbuf->offsets[i] = i * gbufsize; > > - mutex_unlock(&fh->cap.lock); > > return 0; > > } > > case VIDIOCMCAPTURE: > > > > > > _______________________________________________ > > v4l-dvb-maintainer mailing list > > v4l-dvb-maintainer@linuxtv.org > > http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer > > > -- 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/