These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / dma / fsl-edma.c

diff --git a/kernel/drivers/dma/fsl-edma.c b/kernel/drivers/dma/fsl-edma.c
index 09e2842..915eec3 100644 (file)
--- a/kernel/drivers/dma/fsl-edma.c
+++ b/kernel/drivers/dma/fsl-edma.c
@@ -881,10 +881,6 @@ static int fsl_edma_probe(struct platform_device *pdev)
 
        }
 
-       ret = fsl_edma_irq_init(pdev, fsl_edma);
-       if (ret)
-               return ret;
-
        fsl_edma->big_endian = of_property_read_bool(np, "big-endian");
 
        INIT_LIST_HEAD(&fsl_edma->dma_dev.channels);
@@ -900,6 +896,11 @@ static int fsl_edma_probe(struct platform_device *pdev)
                fsl_edma_chan_mux(fsl_chan, 0, false);
        }
 
+       edma_writel(fsl_edma, ~0, fsl_edma->membase + EDMA_INTR);
+       ret = fsl_edma_irq_init(pdev, fsl_edma);
+       if (ret)
+               return ret;
+
        dma_cap_set(DMA_PRIVATE, fsl_edma->dma_dev.cap_mask);
        dma_cap_set(DMA_SLAVE, fsl_edma->dma_dev.cap_mask);
        dma_cap_set(DMA_CYCLIC, fsl_edma->dma_dev.cap_mask);