Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0787643a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9c323bff c5709d37

drivers/dma/altera-msgdma.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}