projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec4bb25
)
ARM i.MX DMA: return gracefully on different socs
author
Sascha Hauer
<s.hauer@pengutronix.de>
Thu, 4 Nov 2010 22:07:56 +0000
(23:07 +0100)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Wed, 24 Nov 2010 09:09:00 +0000
(10:09 +0100)
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>
arch/arm/mach-imx/dma-v1.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-imx/dma-v1.c
b/arch/arm/mach-imx/dma-v1.c
index
3e8c47c
..
dcb24a9
100644
(file)
--- 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);