summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-10-24 09:15:32 +0100
committerVinod Koul <vkoul@kernel.org>2018-10-24 09:15:32 +0100
commite1b5c26e254af3f4f59cdddb91c21b48c2c34b2c (patch)
tree0c9302ce661aa9775e51edcb4504b639adf66df8
parent27d8d2d7a9b7eb05c4484b74b749eaee7b50b845 (diff)
parentd8570d018f69de60ec65790083767fd2e44a6c7a (diff)
downloadlinux-e1b5c26e254af3f4f59cdddb91c21b48c2c34b2c.tar.bz2
Merge branch 'topic/at' into for-linus
-rw-r--r--drivers/dma/at_xdmac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 4bf72561667c..4e557684f792 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -1600,7 +1600,7 @@ static void at_xdmac_tasklet(unsigned long data)
if (atchan->status & AT_XDMAC_CIS_ROIS)
dev_err(chan2dev(&atchan->chan), "request overflow error!!!");
- spin_lock_bh(&atchan->lock);
+ spin_lock(&atchan->lock);
desc = list_first_entry(&atchan->xfers_list,
struct at_xdmac_desc,
xfer_node);
@@ -1610,7 +1610,7 @@ static void at_xdmac_tasklet(unsigned long data)
txd = &desc->tx_dma_desc;
at_xdmac_remove_xfer(atchan, desc);
- spin_unlock_bh(&atchan->lock);
+ spin_unlock(&atchan->lock);
if (!at_xdmac_chan_is_cyclic(atchan)) {
dma_cookie_complete(txd);