Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
index be2e62b879481f592aa965d4fe165b4ae8771896..6775f2c74e25b7269417bbe001adfb03698dea97 100644 (file)
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -852,6 +852,25 @@ 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;
+
+       for (i = 0; i < DMAMUX_NR; i++)
+               clk_disable_unprepare(fsl_edma->muxclk[i]);
+}
+
 static int fsl_edma_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
@@ -897,6 +916,10 @@ static int fsl_edma_probe(struct platform_device *pdev)
 
                ret = clk_prepare_enable(fsl_edma->muxclk[i]);
                if (ret) {
+                       /* disable only clks which were enabled on error */
+                       for (; i >= 0; i--)
+                               clk_disable_unprepare(fsl_edma->muxclk[i]);
+
                        dev_err(&pdev->dev, "DMAMUX clk block failed.\n");
                        return ret;
                }
@@ -951,14 +974,18 @@ static int fsl_edma_probe(struct platform_device *pdev)
 
        ret = dma_async_device_register(&fsl_edma->dma_dev);
        if (ret) {
-               dev_err(&pdev->dev, "Can't register Freescale eDMA engine.\n");
+               dev_err(&pdev->dev,
+                       "Can't register Freescale eDMA engine. (%d)\n", ret);
+               fsl_disable_clocks(fsl_edma);
                return ret;
        }
 
        ret = of_dma_controller_register(np, fsl_edma_xlate, fsl_edma);
        if (ret) {
-               dev_err(&pdev->dev, "Can't register Freescale eDMA of_dma.\n");
+               dev_err(&pdev->dev,
+                       "Can't register Freescale eDMA of_dma. (%d)\n", ret);
                dma_async_device_unregister(&fsl_edma->dma_dev);
+               fsl_disable_clocks(fsl_edma);
                return ret;
        }
 
@@ -968,17 +995,27 @@ 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);
-       int i;
 
+       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);
-
-       for (i = 0; i < DMAMUX_NR; i++)
-               clk_disable_unprepare(fsl_edma->muxclk[i]);
+       fsl_disable_clocks(fsl_edma);
 
        return 0;
 }