Skip to contentSkip to conversation

dmaengine: s3c24xx: missing unlock on an error path

PATCH Applied Dan Carpenter 3 participants 3 messages Jan 30, 2015 – Feb 5, 2015

Subsystems (3)
Kernel janitors Arm Samsung Exynos dmaengine
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 dmaengine: s3c24xx: missing unlock on an error path

We should unlock here before returning -EINVAL.

Fixes 39ad46009654 ('dmaengine: s3c24xx: Split device_control')
Signed-off-by Dan Carpenter <[email protected]>
drivers/dma/s3c24xx-dma.c +5 -3
index 4d5a848..2f91da3 100644
@@ -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)