summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorNiklas Cassel <niklas.cassel@axis.com>2015-04-07 16:42:45 +0200
committerVinod Koul <vinod.koul@intel.com>2015-04-17 23:38:28 +0530
commit0434a23198d6a271b70b75221c7568e60482c04e (patch)
tree8ed204759cf773877c9de9992dc793d894492bcc /drivers/dma
parent9c361b1afd9b4b2bba7fa1ffb080c9f5de3ff108 (diff)
downloadop-kernel-dev-0434a23198d6a271b70b75221c7568e60482c04e.zip
op-kernel-dev-0434a23198d6a271b70b75221c7568e60482c04e.tar.gz
dmaengine: at_xdmac: unlock spin lock before return
Signed-off-by: Niklas Cassel <niklass@axis.com> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/at_xdmac.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 09e2825..6d18abf 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -1155,8 +1155,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);
OpenPOWER on IntegriCloud