redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

MLK-14541 dmaengine: fsl-edma: remove the duplicated code 

The function .fsl_edma_irq_init() has been called twice in .probe(), which
cause all dma controller registered failed.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
pull/10/head
Andy Duan 2017-03-29 13:26:26 +08:00 committed by Jason Liu
parent a28ab62516
commit cb20852875
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/fsl-edma.c
View File

@ -1079,6 +1079,7 @@ static int fsl_edma_probe(struct platform_device *pdev)
}
edma_writel(fsl_edma, ~0, fsl_edma->membase + EDMA_INTR);
if (fsl_edma->version == 1)
ret = fsl_edma_irq_init(pdev, fsl_edma);
else
@ -1105,11 +1106,6 @@ static int fsl_edma_probe(struct platform_device *pdev)
fsl_chan->vchan.chan.chan_id = 0;
}
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);