git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[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
dcb24a9
..
e9f1769
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 */