From patchwork Tue Aug 24 12:52:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 126441 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7OCr4XU016652 for ; Tue, 24 Aug 2010 12:53:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753046Ab0HXMwf (ORCPT ); Tue, 24 Aug 2010 08:52:35 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:53030 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375Ab0HXMwf (ORCPT ); Tue, 24 Aug 2010 08:52:35 -0400 Received: from 201-13-165-245.dial-up.telesp.net.br ([201.13.165.245] helo=[192.168.30.170]) by bombadil.infradead.org with esmtpsa (Exim 4.72 #1 (Red Hat Linux)) id 1OnszP-0002cn-OY; Tue, 24 Aug 2010 12:52:32 +0000 Message-ID: <4C73C094.1000101@infradead.org> Date: Tue, 24 Aug 2010 09:52:36 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.8) Gecko/20100803 Red Hat/3.1.2-1.el6 Lightning/1.0b2 Thunderbird/3.1.2 MIME-Version: 1.0 To: Richard Zidlicky CC: Jiri Slaby , Kulikov Vasiliy , kernel-janitors@vger.kernel.org, Douglas Schilling Landgraf , Jiri Kosina , Roel Kluin , Andrew Morton , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] dvb: siano: free spinlock before schedule() References: <1280256161-7971-1-git-send-email-segooon@gmail.com> <4C4F5CA7.1030706@gmail.com> <20100808161022.GB5594@linux-m68k.org> In-Reply-To: <20100808161022.GB5594@linux-m68k.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 24 Aug 2010 12:53:48 +0000 (UTC) --- patchwork.orig/drivers/media/dvb/siano/smscoreapi.c +++ patchwork/drivers/media/dvb/siano/smscoreapi.c @@ -1098,31 +1098,26 @@ EXPORT_SYMBOL_GPL(smscore_onresponse); * * @return pointer to descriptor on success, NULL on error. */ -struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev) + +struct smscore_buffer_t *get_entry(struct smscore_device_t *coredev) { struct smscore_buffer_t *cb = NULL; unsigned long flags; - DEFINE_WAIT(wait); - spin_lock_irqsave(&coredev->bufferslock, flags); + if (!list_empty(&coredev->buffers)) { + cb = (struct smscore_buffer_t *) coredev->buffers.next; + list_del(&cb->entry); + } + spin_unlock_irqrestore(&coredev->bufferslock, flags); + return cb; +} - /* This function must return a valid buffer, since the buffer list is - * finite, we check that there is an available buffer, if not, we wait - * until such buffer become available. - */ - - prepare_to_wait(&coredev->buffer_mng_waitq, &wait, TASK_INTERRUPTIBLE); - - if (list_empty(&coredev->buffers)) - schedule(); - - finish_wait(&coredev->buffer_mng_waitq, &wait); - - cb = (struct smscore_buffer_t *) coredev->buffers.next; - list_del(&cb->entry); +struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev) +{ + struct smscore_buffer_t *cb = NULL; - spin_unlock_irqrestore(&coredev->bufferslock, flags); + wait_event(coredev->buffer_mng_waitq, (cb = get_entry(coredev))); return cb; }