Skip to content

Commit

Permalink
dmaengine: s3c24xx: missing unlock on an error path
Browse files Browse the repository at this point in the history
We should unlock here before returning -EINVAL.

Fixes: 39ad460 ('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>
  • Loading branch information
Dan Carpenter authored and Vinod Koul committed Feb 5, 2015
1 parent 68a8cc9 commit 3028718
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/dma/s3c24xx-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 3028718

Please sign in to comment.