projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ef5195)
arm: dma: check clk_get() result
authorVasiliy Kulikov <segoon@openwall.com>
Fri, 26 Nov 2010 17:05:55 +0000 (20:05 +0300)
committerSascha Hauer <s.hauer@pengutronix.de>
Fri, 3 Dec 2010 10:05:12 +0000 (11:05 +0100)
clk_get() may return ERR_PTR(), if so propagate return code as
imx_dma_init() return code.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-imx/dma-v1.c patch | blob | blame | history

diff --git a/arch/arm/mach-imx/dma-v1.c b/arch/arm/mach-imx/dma-v1.c
index dcb24a90998c711abcb11fb84bdab1248a0c836a..e9f1769b49f51839a8eafe3ab5a5c8159b5670d0 100644 (file)
--- a/arch/arm/mach-imx/dma-v1.c
+++ b/arch/arm/mach-imx/dma-v1.c
@@ -821,6 +821,8 @@ static int __init imx_dma_init(void)
                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 */