UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dmaengine: mic_x100: add missing spin_unlock 

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>
This commit is contained in:
Saurabh Sengar 2015-11-30 21:19:04 +05:30 committed by Vinod Koul
parent 27bc944ca3
commit e958e079e2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/dma/mic_x100_dma.c
View File

@ -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 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;
@ -324,10 +325,13 @@ 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)
return allocate_tx(mic_ch); tx = 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 NULL; return tx;
} }
static struct dma_async_tx_descriptor * 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); 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)
return allocate_tx(mic_ch); tx = allocate_tx(mic_ch);
spin_unlock(&mic_ch->prep_lock); spin_unlock(&mic_ch->prep_lock);
return NULL; return tx;
} }
/* Return the status of the transaction */ /* Return the status of the transaction */