Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-2
+2
-2
drivers/dma/altera-msgdma.c
+2
-2
drivers/dma/altera-msgdma.c
···
344
344
345
345
spin_lock_irqsave(&mdev->lock, irqflags);
346
346
if (desc_cnt > mdev->desc_free_cnt) {
347
-
spin_unlock_bh(&mdev->lock);
347
+
spin_unlock_irqrestore(&mdev->lock, irqflags);
348
348
dev_dbg(mdev->dev, "mdev %p descs are not available\n", mdev);
349
349
return NULL;
350
350
}
···
407
407
408
408
spin_lock_irqsave(&mdev->lock, irqflags);
409
409
if (desc_cnt > mdev->desc_free_cnt) {
410
-
spin_unlock_bh(&mdev->lock);
410
+
spin_unlock_irqrestore(&mdev->lock, irqflags);
411
411
dev_dbg(mdev->dev, "mdev %p descs are not available\n", mdev);
412
412
return NULL;
413
413
}