Commit 16605e8d authored by Ashutosh Dixit's avatar Ashutosh Dixit Committed by Vinod Koul

dmaengine: Revert "dmaengine: mic_x100: add missing spin_unlock"

This reverts commit e958e079 ("dmaengine: mic_x100: add missing
spin_unlock").

The above patch is incorrect. There is nothing wrong with the original
code. The spin_lock is acquired in the "prep" functions and released
in "submit".
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 16830985
...@@ -317,7 +317,6 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest, ...@@ -317,7 +317,6 @@ 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 mic_dma_chan *mic_ch = to_mic_dma_chan(ch);
struct device *dev = mic_dma_ch_to_device(mic_ch); struct device *dev = mic_dma_ch_to_device(mic_ch);
int result; int result;
struct dma_async_tx_descriptor *tx = NULL;
if (!len && !flags) if (!len && !flags)
return NULL; return NULL;
...@@ -325,13 +324,10 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest, ...@@ -325,13 +324,10 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest,
spin_lock(&mic_ch->prep_lock); spin_lock(&mic_ch->prep_lock);
result = mic_dma_do_dma(mic_ch, flags, dma_src, dma_dest, len); result = mic_dma_do_dma(mic_ch, flags, dma_src, dma_dest, len);
if (result >= 0) if (result >= 0)
tx = allocate_tx(mic_ch); return allocate_tx(mic_ch);
dev_err(dev, "Error enqueueing dma, error=%d\n", result);
if (!tx)
dev_err(dev, "Error enqueueing dma, error=%d\n", result);
spin_unlock(&mic_ch->prep_lock); spin_unlock(&mic_ch->prep_lock);
return tx; return NULL;
} }
static struct dma_async_tx_descriptor * static struct dma_async_tx_descriptor *
...@@ -339,14 +335,13 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags) ...@@ -339,14 +335,13 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags)
{ {
struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch); struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch);
int ret; int ret;
struct dma_async_tx_descriptor *tx = NULL;
spin_lock(&mic_ch->prep_lock); spin_lock(&mic_ch->prep_lock);
ret = mic_dma_do_dma(mic_ch, flags, 0, 0, 0); ret = mic_dma_do_dma(mic_ch, flags, 0, 0, 0);
if (!ret) if (!ret)
tx = allocate_tx(mic_ch); return allocate_tx(mic_ch);
spin_unlock(&mic_ch->prep_lock); spin_unlock(&mic_ch->prep_lock);
return tx; return NULL;
} }
/* Return the status of the transaction */ /* Return the status of the transaction */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment