Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-imx / dma-v1.c

diff --git a/arch/arm/mach-imx/dma-v1.c b/arch/arm/mach-imx/dma-v1.c
index 3e8c47c63bac6bb3556c5b74e90c9def1b66e4c5..e9f1769b49f51839a8eafe3ab5a5c8159b5670d0 100644 (file)
--- a/arch/arm/mach-imx/dma-v1.c
+++ b/arch/arm/mach-imx/dma-v1.c
@@ -818,9 +818,11 @@ 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");
+       if (IS_ERR(dma_clk))
+               return PTR_ERR(dma_clk);
        clk_enable(dma_clk);
 
        /* reset DMA module */