public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: Saurabh Sengar <saurabh.truth@gmail.com>
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
Date: Mon, 30 Nov 2015 20:57:24 +0530	[thread overview]
Message-ID: <20151130152724.GF3901@localhost> (raw)
In-Reply-To: <1447072539-31146-1-git-send-email-saurabh.truth@gmail.com>

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 <saurabh.truth@gmail.com>
> ---
>  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

  reply	other threads:[~2015-11-30 15:24 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-09 12:35 [PATCH] dma: mic_x100: add missing spin_unlock Saurabh Sengar
2015-11-30 15:27 ` Vinod Koul [this message]
2015-11-30 15:49   ` [PATCH v2] " Saurabh Sengar
2015-12-05 10:31     ` Vinod Koul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151130152724.GF3901@localhost \
    --to=vinod.koul@intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=saurabh.truth@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox