Merge tag 'dmaengine-4.7-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[mirror_ubuntu-eoan-kernel.git] / drivers / dma / edma.c

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 04070baab78ab0cc7772085dd70828741317dd5a..8181ed1313865015a169b1e19e44de5ad3df8eb5 100644 (file)
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -1537,8 +1537,17 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
 
        dev_vdbg(ecc->dev, "dma_ccerr_handler\n");
 
-       if (!edma_error_pending(ecc))
+       if (!edma_error_pending(ecc)) {
+               /*
+                * The registers indicate no pending error event but the irq
+                * handler has been called.
+                * Ask eDMA to re-evaluate the error registers.
+                */
+               dev_err(ecc->dev, "%s: Error interrupt without error event!\n",
+                       __func__);
+               edma_write(ecc, EDMA_EEVAL, 1);
                return IRQ_NONE;
+       }
 
        while (1) {
                /* Event missed register(s) */