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

Commit 0fe25d61 authored by Stefan Agner's avatar Stefan Agner Committed by Vinod Koul
Browse files

dmaengine: fsl-edma: clear pending interrupts on initialization 



Clear pending interrupts before requesting interrupts and move
interrupt initialization after channels have been initialized.
This avoids a NULL pointer dereference panic when using kexec
while DMA requests were running.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent b206d9a2

drivers/dma/fsl-edma.c

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