Skip to contentSkip to conversation

dmaengine: at_xdmac: unlock spin lock before return

PATCH In review Niklas Cassel 3 participants 3 messages Apr 7, 2015 – Apr 17, 2015

Subsystems (2)
dmaengine Microchip AT91 DMA drivers
lore
Share & tools
lore

Niklas Cassel

author
#0 lore raw

PATCH 1/1 dmaengine: at_xdmac: unlock spin lock before return

Signed-off-by Niklas Cassel <[email protected]>
---
 drivers/dma/at_xdmac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/at_xdmac.c +3 -1
index d9891d3..933e4b3 100644
@@ -1154,8 +1154,10 @@ static int at_xdmac_device_resume(struct dma_chan *chan)
 	dev_dbg(chan2dev(chan), "%s\n", __func__);
 
 	spin_lock_bh(&atchan->lock);
-	if (!at_xdmac_chan_is_paused(atchan))
+	if (!at_xdmac_chan_is_paused(atchan)) {
+		spin_unlock_bh(&atchan->lock);
 		return 0;
+	}
 
 	at_xdmac_write(atxdmac, AT_XDMAC_GRWR, atchan->mask);
 	clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
Signature · 1 line
2.1.4
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Niklas Cassel
Signed-off-by Niklas Cassel <[email protected]>

of course

Acked-by Ludovic Desroches <[email protected]>

Thanks

Quoted 23 lines
---
 drivers/dma/at_xdmac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/at_xdmac.c +3 -1
index d9891d3..933e4b3 100644
@@ -1154,8 +1154,10 @@ static int at_xdmac_device_resume(struct dma_chan *chan)
 	dev_dbg(chan2dev(chan), "%s\n", __func__);
 
 	spin_lock_bh(&atchan->lock);
-	if (!at_xdmac_chan_is_paused(atchan))
+	if (!at_xdmac_chan_is_paused(atchan)) {
+		spin_unlock_bh(&atchan->lock);
 		return 0;
+	}
 
 	at_xdmac_write(atxdmac, AT_XDMAC_GRWR, atchan->mask);
 	clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
Signature · 1 line
2.1.4
#2 lore raw
In reply to Niklas Cassel
Quoted 24 lines · Niklas Cassel
Signed-off-by Niklas Cassel <[email protected]>
---
 drivers/dma/at_xdmac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/at_xdmac.c +3 -1
index d9891d3..933e4b3 100644
@@ -1154,8 +1154,10 @@ static int at_xdmac_device_resume(struct dma_chan *chan)
 	dev_dbg(chan2dev(chan), "%s\n", __func__);
 
 	spin_lock_bh(&atchan->lock);
-	if (!at_xdmac_chan_is_paused(atchan))
+	if (!at_xdmac_chan_is_paused(atchan)) {
+		spin_unlock_bh(&atchan->lock);
 		return 0;
+	}
 
 	at_xdmac_write(atxdmac, AT_XDMAC_GRWR, atchan->mask);
 	clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
Signature · 1 line
2.1.4

Applied now

Signature · 1 line
~Vinod