projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
imx2_wdt.c
diff --git
a/drivers/watchdog/imx2_wdt.c
b/drivers/watchdog/imx2_wdt.c
index 2ee7dac55a3c454fb010c662e8dc9d11a7199f7b..86f7cac1026c9c0de69ef0180398e71ecfcbe660 100644
(file)
--- a/
drivers/watchdog/imx2_wdt.c
+++ b/
drivers/watchdog/imx2_wdt.c
@@
-270,7
+270,7
@@
static int __init imx2_wdt_probe(struct platform_device *pdev)
return -ENOMEM;
}
- imx2_wdt.clk = clk_get
_sys("imx-wdt.0"
, NULL);
+ imx2_wdt.clk = clk_get
(&pdev->dev
, NULL);
if (IS_ERR(imx2_wdt.clk)) {
dev_err(&pdev->dev, "can't get Watchdog clock\n");
return PTR_ERR(imx2_wdt.clk);