From patchwork Sun Aug 8 16:10:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zidlicky X-Patchwork-Id: 118276 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 o78GGs0h031837 for ; Sun, 8 Aug 2010 16:16:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754546Ab0HHQQh (ORCPT ); Sun, 8 Aug 2010 12:16:37 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:61708 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754414Ab0HHQQg (ORCPT ); Sun, 8 Aug 2010 12:16:36 -0400 Received: by wyb39 with SMTP id 39so9211199wyb.19 for ; Sun, 08 Aug 2010 09:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:sender:received:date:from:to :cc:subject:message-id:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=KwCChj14cvTnmxjaXAKzqDUx//RXwRAssSyg1Yi9pDA=; b=wsC5NeWvyZEGmJvi7dqNUxHn8QQzhDmx8UQiox6/bkym8AgieynBFXtz32MfUiPLdg rDBxp14vOu8koUk4WYHaEvIK2cayPRu20Zrz2+Ys19Ld6CcQlfUJNFoTqP8wqZZyxFy5 aIH7Ld6hzz6fsa0RsqOO7JxZ7IscLV67pMuU0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=RoGfKiaFMdqyyu+vn5orWdn0q9CVpS/3GDmd0CF5dblzsm++W4sKUwSvjhqtePlsL2 n/MLqkcbXA56VZ/vzWok/p5PAcSOQOgp43/yryAlkEdhljW13vlil/tQED4DI20iWtft MrmcRapz9gLpFlgBWM4FWooeT7t1Za9Ve0uVY= Received: by 10.216.45.16 with SMTP id o16mr1678286web.45.1281284194450; Sun, 08 Aug 2010 09:16:34 -0700 (PDT) Received: from localhost.localdomain ([89.204.137.209]) by mx.google.com with ESMTPS id k7sm2043795wej.26.2010.08.08.09.16.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 08 Aug 2010 09:16:32 -0700 (PDT) Received: from rz by localhost.localdomain with local (Exim 4.69) (envelope-from ) id 1Oi8S6-0001uF-JB; Sun, 08 Aug 2010 18:10:22 +0200 Date: Sun, 8 Aug 2010 18:10:22 +0200 From: Richard Zidlicky To: Jiri Slaby Cc: Kulikov Vasiliy , kernel-janitors@vger.kernel.org, Mauro Carvalho Chehab , 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() Message-ID: <20100808161022.GB5594@linux-m68k.org> References: <1280256161-7971-1-git-send-email-segooon@gmail.com> <4C4F5CA7.1030706@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4C4F5CA7.1030706@gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) 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]); Sun, 08 Aug 2010 16:16:55 +0000 (UTC) --- linux-2.6.34/drivers/media/dvb/siano/smscoreapi.c.rz 2010-06-03 21:58:11.000000000 +0200 +++ linux-2.6.34/drivers/media/dvb/siano/smscoreapi.c 2010-06-07 14:32:06.000000000 +0200 @@ -1100,31 +1100,26 @@ * * @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); - - /* 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); - + 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; +} + +struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev) +{ + struct smscore_buffer_t *cb = NULL; + + wait_event(coredev->buffer_mng_waitq, (cb = get_entry(coredev))); return cb; }