Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754612AbbK3PY3 (ORCPT ); Mon, 30 Nov 2015 10:24:29 -0500 Received: from mga01.intel.com ([192.55.52.88]:3977 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754523AbbK3PY1 (ORCPT ); Mon, 30 Nov 2015 10:24:27 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,364,1444719600"; d="scan'208";a="850549048" Date: Mon, 30 Nov 2015 20:57:24 +0530 From: Vinod Koul To: Saurabh Sengar Cc: dan.j.williams@intel.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] dma: mic_x100: add missing spin_unlock Message-ID: <20151130152724.GF3901@localhost> References: <1447072539-31146-1-git-send-email-saurabh.truth@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1447072539-31146-1-git-send-email-saurabh.truth@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2112 Lines: 69 On Mon, Nov 09, 2015 at 06:05:39PM +0530, Saurabh Sengar wrote: > spin lock should be released while returning from function > > Signed-off-by: Saurabh Sengar > --- > drivers/dma/mic_x100_dma.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/drivers/dma/mic_x100_dma.c b/drivers/dma/mic_x100_dma.c > index 068e920..7f6d477 100644 > --- a/drivers/dma/mic_x100_dma.c > +++ b/drivers/dma/mic_x100_dma.c > @@ -317,17 +317,21 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest, > struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch); > struct device *dev = mic_dma_ch_to_device(mic_ch); > int result; > + struct dma_async_tx_descriptor *tx = NULL; > > if (!len && !flags) > - return NULL; > + return tx; This one doesn't make sense, tx will be NULL here, so orignal one is fine > > spin_lock(&mic_ch->prep_lock); > result = mic_dma_do_dma(mic_ch, flags, dma_src, dma_dest, len); > if (result >= 0) > - return allocate_tx(mic_ch); > - dev_err(dev, "Error enqueueing dma, error=%d\n", result); > + tx = allocate_tx(mic_ch); > + > + if(!tx) > + dev_err(dev, "Error enqueueing dma, error=%d\n", result); > + > spin_unlock(&mic_ch->prep_lock); > - return NULL; > + return tx; > } > > static struct dma_async_tx_descriptor * > @@ -335,13 +339,14 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags) > { > struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch); > int ret; > + struct dma_async_tx_descriptor *tx = NULL; > > spin_lock(&mic_ch->prep_lock); > ret = mic_dma_do_dma(mic_ch, flags, 0, 0, 0); > if (!ret) > - return allocate_tx(mic_ch); > + tx = allocate_tx(mic_ch); > spin_unlock(&mic_ch->prep_lock); > - return NULL; > + return tx; > } > > /* Return the status of the transaction */ > -- > 1.9.1 > -- ~Vinod -- 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/