AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

dmaengine: s3c24xx: missing unlock on an error path

Browse Source 
We should unlock here before returning -EINVAL.

Fixes: 39ad460096 ('dmaengine: s3c24xx: Split device_control')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Dan Carpenter 2015-01-30 11:29:33 +03:00 committed by Vinod Koul
parent 68a8cc9e9e
commit 3028718fd0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma/s3c24xx-dma.c
View File

@ -718,13 +718,15 @@ static int s3c24xx_dma_terminate_all(struct dma_chan *chan)
struct s3c24xx_dma_chan *s3cchan = to_s3c24xx_dma_chan(chan);
struct s3c24xx_dma_engine *s3cdma = s3cchan->host;
unsigned long flags;
int ret = 0;
spin_lock_irqsave(&s3cchan->vc.lock, flags);
if (!s3cchan->phy && !s3cchan->at) {
dev_err(&s3cdma->pdev->dev, "trying to terminate already stopped channel %d\n",
s3cchan->id);
return -EINVAL;
ret = -EINVAL;
goto unlock;
}
s3cchan->state = S3C24XX_DMA_CHAN_IDLE;
@ -741,10 +743,10 @@ static int s3c24xx_dma_terminate_all(struct dma_chan *chan)
/* Dequeue jobs not yet fired as well */
s3c24xx_dma_free_txd_list(s3cdma, s3cchan);
unlock:
spin_unlock_irqrestore(&s3cchan->vc.lock, flags);
return 0;
return ret;
}
static int s3c24xx_dma_alloc_chan_resources(struct dma_chan *chan)