mm/memblock.c: fix NULL dereference error

[cascardo/linux.git] / drivers / dma / nbpfaxi.c

diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c
index 9f0e98b..08c45c1 100644 (file)
--- a/drivers/dma/nbpfaxi.c
+++ b/drivers/dma/nbpfaxi.c
@@ -227,6 +227,7 @@ struct nbpf_device {
        void __iomem *base;
        struct clk *clk;
        const struct nbpf_config *config;
+       unsigned int eirq;
        struct nbpf_channel chan[];
 };
 
@@ -1375,6 +1376,7 @@ static int nbpf_probe(struct platform_device *pdev)
                               IRQF_SHARED, "dma error", nbpf);
        if (ret < 0)
                return ret;
+       nbpf->eirq = eirq;
 
        INIT_LIST_HEAD(&dma_dev->channels);
 
@@ -1446,6 +1448,17 @@ e_clk_off:
 static int nbpf_remove(struct platform_device *pdev)
 {
        struct nbpf_device *nbpf = platform_get_drvdata(pdev);
+       int i;
+
+       devm_free_irq(&pdev->dev, nbpf->eirq, nbpf);
+
+       for (i = 0; i < nbpf->config->num_channels; i++) {
+               struct nbpf_channel *chan = nbpf->chan + i;
+
+               devm_free_irq(&pdev->dev, chan->irq, chan);
+
+               tasklet_kill(&chan->tasklet);
+       }
 
        of_dma_controller_free(pdev->dev.of_node);
        dma_async_device_unregister(&nbpf->dma_dev);