Skip to content

Commit

Permalink
dmaengine: mic_x100: add missing spin_unlock
Browse files Browse the repository at this point in the history
spin lock should be released while returning from function

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Saurabh Sengar authored and Vinod Koul committed Dec 5, 2015
1 parent 27bc944 commit e958e07
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/dma/mic_x100_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,31 +317,36 @@ 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;

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 *
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 */
Expand Down

0 comments on commit e958e07

Please sign in to comment.