summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2012-07-03 15:33:29 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:04 -0700
commit449daa0ed24c186c7fd014e698f37cbb8aaf7a4c (patch)
tree13db0b624d95f870b4f673a8f13230db5f4f379a /drivers
parent588d6b125faae8f369352dedaa4632071b93e78e (diff)
downloadlinux-3.10-449daa0ed24c186c7fd014e698f37cbb8aaf7a4c.tar.gz
linux-3.10-449daa0ed24c186c7fd014e698f37cbb8aaf7a4c.tar.bz2
linux-3.10-449daa0ed24c186c7fd014e698f37cbb8aaf7a4c.zip
Revert dma: imx-dma: Fix kernel crash due to missing clock conversion
This reverts 9ea2c02bafe276e97b592a046ac733610a6d57fd, which was commit a2367db2ec5e7fc6fe93e221e0fcdee81b053daf upstream. It broke the build on 3.4, and was not needed there. Reported-by: Eric BĂ©nard <eric@eukrea.com> Cc: Javier Martin <javier.martin@vista-silicon.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/imx-dma.c36
1 files changed, 11 insertions, 25 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 2ca8d3f779f..bb787d8e152 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -172,8 +172,7 @@ struct imxdma_engine {
struct device_dma_parameters dma_parms;
struct dma_device dma_device;
void __iomem *base;
- struct clk *dma_ahb;
- struct clk *dma_ipg;
+ struct clk *dma_clk;
spinlock_t lock;
struct imx_dma_2d_config slots_2d[IMX_DMA_2D_SLOTS];
struct imxdma_channel channel[IMX_DMA_CHANNELS];
@@ -977,20 +976,10 @@ static int __init imxdma_probe(struct platform_device *pdev)
return 0;
}
- imxdma->dma_ipg = devm_clk_get(&pdev->dev, "ipg");
- if (IS_ERR(imxdma->dma_ipg)) {
- ret = PTR_ERR(imxdma->dma_ipg);
- goto err_clk;
- }
-
- imxdma->dma_ahb = devm_clk_get(&pdev->dev, "ahb");
- if (IS_ERR(imxdma->dma_ahb)) {
- ret = PTR_ERR(imxdma->dma_ahb);
- goto err_clk;
- }
-
- clk_prepare_enable(imxdma->dma_ipg);
- clk_prepare_enable(imxdma->dma_ahb);
+ imxdma->dma_clk = clk_get(NULL, "dma");
+ if (IS_ERR(imxdma->dma_clk))
+ return PTR_ERR(imxdma->dma_clk);
+ clk_enable(imxdma->dma_clk);
/* reset DMA module */
imx_dmav1_writel(imxdma, DCR_DRST, DMA_DCR);
@@ -999,14 +988,16 @@ static int __init imxdma_probe(struct platform_device *pdev)
ret = request_irq(MX1_DMA_INT, dma_irq_handler, 0, "DMA", imxdma);
if (ret) {
dev_warn(imxdma->dev, "Can't register IRQ for DMA\n");
- goto err_enable;
+ kfree(imxdma);
+ return ret;
}
ret = request_irq(MX1_DMA_ERR, imxdma_err_handler, 0, "DMA", imxdma);
if (ret) {
dev_warn(imxdma->dev, "Can't register ERRIRQ for DMA\n");
free_irq(MX1_DMA_INT, NULL);
- goto err_enable;
+ kfree(imxdma);
+ return ret;
}
}
@@ -1103,10 +1094,7 @@ err_init:
free_irq(MX1_DMA_INT, NULL);
free_irq(MX1_DMA_ERR, NULL);
}
-err_enable:
- clk_disable_unprepare(imxdma->dma_ipg);
- clk_disable_unprepare(imxdma->dma_ahb);
-err_clk:
+
kfree(imxdma);
return ret;
}
@@ -1126,9 +1114,7 @@ static int __exit imxdma_remove(struct platform_device *pdev)
free_irq(MX1_DMA_ERR, NULL);
}
- clk_disable_unprepare(imxdma->dma_ipg);
- clk_disable_unprepare(imxdma->dma_ahb);
- kfree(imxdma);
+ kfree(imxdma);
return 0;
}