diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-21 14:32:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-21 14:32:46 -0400 |
| commit | 0787643a5f6aad1f0cdeb305f7fe492b71943ea4 (patch) | |
| tree | 9dae393937fdb0569909dc1ea811380c8d0d07e4 /drivers | |
| parent | 9c323bff13f92832e03657cabdd70d731408d621 (diff) | |
| parent | c5709d37693b72761d866cb1cd556093a6607c80 (diff) | |
| download | linux-exynos-0787643a5f6aad1f0cdeb305f7fe492b71943ea4.tar.gz linux-exynos-0787643a5f6aad1f0cdeb305f7fe492b71943ea4.tar.bz2 linux-exynos-0787643a5f6aad1f0cdeb305f7fe492b71943ea4.zip | |
Merge tag 'dmaengine-fix-4.14-rc6' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fix from Vinod Koul:
"Late fix for altera driver which fixes the locking in driver"
* tag 'dmaengine-fix-4.14-rc6' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: altera: Use IRQ-safe spinlock calls in the error paths as well
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/altera-msgdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c index 339186f25a2a..55f9c62ee54b 100644 --- a/drivers/dma/altera-msgdma.c +++ b/drivers/dma/altera-msgdma.c @@ -344,7 +344,7 @@ msgdma_prep_memcpy(struct dma_chan *dchan, dma_addr_t dma_dst, spin_lock_irqsave(&mdev->lock, irqflags); if (desc_cnt > mdev->desc_free_cnt) { - spin_unlock_bh(&mdev->lock); + spin_unlock_irqrestore(&mdev->lock, irqflags); dev_dbg(mdev->dev, "mdev %p descs are not available\n", mdev); return NULL; } @@ -407,7 +407,7 @@ msgdma_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl, spin_lock_irqsave(&mdev->lock, irqflags); if (desc_cnt > mdev->desc_free_cnt) { - spin_unlock_bh(&mdev->lock); + spin_unlock_irqrestore(&mdev->lock, irqflags); dev_dbg(mdev->dev, "mdev %p descs are not available\n", mdev); return NULL; } |