Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3028718f authored by Dan Carpenter's avatar Dan Carpenter Committed by Vinod Koul
Browse files

dmaengine: s3c24xx: missing unlock on an error path 



We should unlock here before returning -EINVAL.

Fixes: 39ad4600 ('dmaengine: s3c24xx: Split device_control')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 68a8cc9e

drivers/dma/s3c24xx-dma.c

+5 −3
Original line number Diff line number Diff line
@@ -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)