* [PATCH] dma: mic_x100: add missing spin_unlock
@ 2015-11-09 12:35 Saurabh Sengar
2015-11-30 15:27 ` Vinod Koul
0 siblings, 1 reply; 4+ messages in thread
From: Saurabh Sengar @ 2015-11-09 12:35 UTC (permalink / raw)
To: dan.j.williams, vinod.koul, dmaengine, linux-kernel; +Cc: Saurabh Sengar
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;
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] dma: mic_x100: add missing spin_unlock
2015-11-09 12:35 [PATCH] dma: mic_x100: add missing spin_unlock Saurabh Sengar
@ 2015-11-30 15:27 ` Vinod Koul
2015-11-30 15:49 ` [PATCH v2] " Saurabh Sengar
0 siblings, 1 reply; 4+ messages in thread
From: Vinod Koul @ 2015-11-30 15:27 UTC (permalink / raw)
To: Saurabh Sengar; +Cc: dan.j.williams, dmaengine, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2] dma: mic_x100: add missing spin_unlock
2015-11-30 15:27 ` Vinod Koul
@ 2015-11-30 15:49 ` Saurabh Sengar
2015-12-05 10:31 ` Vinod Koul
0 siblings, 1 reply; 4+ messages in thread
From: Saurabh Sengar @ 2015-11-30 15:49 UTC (permalink / raw)
To: vinod.koul, dan.j.williams, dmaengine, linux-kernel; +Cc: Saurabh Sengar
spin lock should be released while returning from function
Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
v2: fixed comment from Vinod Koul
drivers/dma/mic_x100_dma.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/mic_x100_dma.c b/drivers/dma/mic_x100_dma.c
index 068e920..cddfa8d 100644
--- a/drivers/dma/mic_x100_dma.c
+++ b/drivers/dma/mic_x100_dma.c
@@ -317,6 +317,7 @@ 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;
@@ -324,10 +325,13 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest,
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-05 10:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-09 12:35 [PATCH] dma: mic_x100: add missing spin_unlock Saurabh Sengar
2015-11-30 15:27 ` Vinod Koul
2015-11-30 15:49 ` [PATCH v2] " Saurabh Sengar
2015-12-05 10:31 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox