mm/memblock.c: fix NULL dereference error

[cascardo/linux.git] / drivers / dma / fsl-edma.c

diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
index cc06eea..6775f2c 100644 (file)
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -852,6 +852,17 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma
        return 0;
 }
 
+static void fsl_edma_irq_exit(
+               struct platform_device *pdev, struct fsl_edma_engine *fsl_edma)
+{
+       if (fsl_edma->txirq == fsl_edma->errirq) {
+               devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
+       } else {
+               devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
+               devm_free_irq(&pdev->dev, fsl_edma->errirq, fsl_edma);
+       }
+}
+
 static void fsl_disable_clocks(struct fsl_edma_engine *fsl_edma)
 {
        int i;
@@ -984,11 +995,24 @@ static int fsl_edma_probe(struct platform_device *pdev)
        return 0;
 }
 
+static void fsl_edma_cleanup_vchan(struct dma_device *dmadev)
+{
+       struct fsl_edma_chan *chan, *_chan;
+
+       list_for_each_entry_safe(chan, _chan,
+                               &dmadev->channels, vchan.chan.device_node) {
+               list_del(&chan->vchan.chan.device_node);
+               tasklet_kill(&chan->vchan.task);
+       }
+}
+
 static int fsl_edma_remove(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        struct fsl_edma_engine *fsl_edma = platform_get_drvdata(pdev);
 
+       fsl_edma_irq_exit(pdev, fsl_edma);
+       fsl_edma_cleanup_vchan(&fsl_edma->dma_dev);
        of_dma_controller_free(np);
        dma_async_device_unregister(&fsl_edma->dma_dev);
        fsl_disable_clocks(fsl_edma);