Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758236AbXLMJ7f (ORCPT ); Thu, 13 Dec 2007 04:59:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751496AbXLMJ71 (ORCPT ); Thu, 13 Dec 2007 04:59:27 -0500 Received: from pentafluge.infradead.org ([213.146.154.40]:48217 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbXLMJ70 (ORCPT ); Thu, 13 Dec 2007 04:59:26 -0500 Subject: Re: [2.6 patch] videobuf-core.c locking fixes From: Mauro Carvalho Chehab To: Shane Cc: Adrian Bunk , Adrian Bunk , Brandon Philips , linux-kernel@vger.kernel.org, video4linux-list In-Reply-To: References: <20071212090709.GF14204@stusta.de> <1197457394.4807.40.camel@gaivota> <20071212120308.GG14204@stusta.de> <1197469316.4744.22.camel@gaivota> <20071212194454.GF10069@stusta.de> Content-Type: text/plain Date: Thu, 13 Dec 2007 07:59:13 -0200 Message-Id: <1197539953.4729.19.camel@gaivota> Mime-Version: 1.0 X-Mailer: Evolution 2.12.0-2mdv2008.0 Content-Transfer-Encoding: 7bit X-SRS-Rewrite: SMTP reverse-path rewritten from by pentafluge.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1520 Lines: 38 > > e1f8b4a49d86746f699919531c17fd154787e308 > > diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c > > index 81f77d2..c8a5cb5 100644 > > --- a/drivers/media/video/videobuf-core.c > > +++ b/drivers/media/video/videobuf-core.c > > @@ -909,7 +909,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q, > > if (q->streaming) > > goto done; > > if (!q->reading) { > > - retval = videobuf_read_start(q); > > + retval = __videobuf_read_start(q); > > if (retval < 0) > > goto done; > > } > > @@ -982,7 +982,7 @@ unsigned int videobuf_poll_stream(struct file *file, > > struct videobuf_buffer, stream); > > } else { > > if (!q->reading) > > - videobuf_read_start(q); > > + __videobuf_read_start(q); > > if (!q->reading) { > > rc = POLLERR; > > } else if (NULL == q->read_buf) { > > > > Yes it does! I was just going to send the same patch myself :) The patch seems ok to my eyes. I dunno why I forgot to replace those two occurrences on my patch :( Cheers, Mauro -- 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/