diff mbox

dmaengine: s3c24xx: missing unlock on an error path

Message ID 20150130082933.GC21357@mwanda (mailing list archive)
State Accepted
Headers show

Commit Message

Dan Carpenter Jan. 30, 2015, 8:29 a.m. UTC 
We should unlock here before returning -EINVAL.

Fixes: 39ad46009654 ('dmaengine: s3c24xx: Split device_control')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Maxime Ripard Feb. 1, 2015, 10:26 a.m. UTC | #1 
On Fri, Jan 30, 2015 at 11:29:33AM +0300, Dan Carpenter wrote:
> We should unlock here before returning -EINVAL.
> 
> Fixes: 39ad46009654 ('dmaengine: s3c24xx: Split device_control')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Thanks!
Maxime
Vinod Koul Feb. 5, 2015, 1:53 a.m. UTC | #2 
On Fri, Jan 30, 2015 at 11:29:33AM +0300, Dan Carpenter wrote:
> We should unlock here before returning -EINVAL.
> 
> Fixes: 39ad46009654 ('dmaengine: s3c24xx: Split device_control')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks
diff mbox

Patch

diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 4d5a848..2f91da3 100644
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -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)