aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-11-04 18:07:56 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2010-11-24 04:09:00 -0500
commit8bffb77e198df83224a6a258291bd41c05ab84d1 (patch)
tree4a95f5aec170950bf2e9238a6c8f276a8cbb6b52
parentec4bb253fcc5c07519b5e701d2c87100aef0d2ba (diff)
ARM i.MX DMA: return gracefully on different socs
Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/dma-v1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/dma-v1.c b/arch/arm/mach-imx/dma-v1.c
index 3e8c47c63ba..dcb24a90998 100644
--- a/arch/arm/mach-imx/dma-v1.c
+++ b/arch/arm/mach-imx/dma-v1.c
@@ -818,7 +818,7 @@ static int __init imx_dma_init(void)
818 imx_dmav1_baseaddr = MX27_IO_ADDRESS(MX27_DMA_BASE_ADDR); 818 imx_dmav1_baseaddr = MX27_IO_ADDRESS(MX27_DMA_BASE_ADDR);
819 else 819 else
820#endif 820#endif
821 BUG(); 821 return 0;
822 822
823 dma_clk = clk_get(NULL, "dma"); 823 dma_clk = clk_get(NULL, "dma");
824 clk_enable(dma_clk); 824 clk_enable(dma_clk);