diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-04 23:07:56 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-24 10:09:00 +0100 |
| commit | 8bffb77e198df83224a6a258291bd41c05ab84d1 (patch) | |
| tree | 4a95f5aec170950bf2e9238a6c8f276a8cbb6b52 /arch | |
| parent | ec4bb253fcc5c07519b5e701d2c87100aef0d2ba (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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/dma-v1.c | 2 |
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) 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); |