projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[cascardo/linux.git]
/
drivers
/
dma
/
ipu
/
ipu_idmac.c
diff --git
a/drivers/dma/ipu/ipu_idmac.c
b/drivers/dma/ipu/ipu_idmac.c
index
9077384
..
e202a6c
100644
(file)
--- a/
drivers/dma/ipu/ipu_idmac.c
+++ b/
drivers/dma/ipu/ipu_idmac.c
@@
-1786,7
+1786,7
@@
static int __init ipu_probe(struct platform_device *pdev)
}
/* Get IPU clock */
- ipu_data.ipu_clk = clk_get(&pdev->dev,
"ipu_clk"
);
+ ipu_data.ipu_clk = clk_get(&pdev->dev,
NULL
);
if (IS_ERR(ipu_data.ipu_clk)) {
ret = PTR_ERR(ipu_data.ipu_clk);
goto err_clk_get;