Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[pandora-kernel.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 3e8c47c..e9f1769 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 */