From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 4 Nov 2010 22:07:56 +0000 (+0100)
Subject: ARM i.MX DMA: return gracefully on different socs
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8bffb77e198df83224a6a258291bd41c05ab84d1;p=linux-beck.git

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>
---

diff --git a/arch/arm/mach-imx/dma-v1.c b/arch/arm/mach-imx/dma-v1.c
index 3e8c47c63bac..dcb24a90998c 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)
 		imx_dmav1_baseaddr = MX27_IO_ADDRESS(MX27_DMA_BASE_ADDR);
 	else
 #endif
-		BUG();
+		return 0;
 
 	dma_clk = clk_get(NULL, "dma");
 	clk_enable(dma_clk);