projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.linux-watchdog.org/linux-watchdog
[cascardo/linux.git]
/
drivers
/
watchdog
/
txx9wdt.c
diff --git
a/drivers/watchdog/txx9wdt.c
b/drivers/watchdog/txx9wdt.c
index
c2da880
..
6f7a9de
100644
(file)
--- a/
drivers/watchdog/txx9wdt.c
+++ b/
drivers/watchdog/txx9wdt.c
@@
-112,7
+112,7
@@
static int __init txx9wdt_probe(struct platform_device *dev)
txx9_imclk = NULL;
goto exit;
}
txx9_imclk = NULL;
goto exit;
}
- ret = clk_enable(txx9_imclk);
+ ret = clk_
prepare_
enable(txx9_imclk);
if (ret) {
clk_put(txx9_imclk);
txx9_imclk = NULL;
if (ret) {
clk_put(txx9_imclk);
txx9_imclk = NULL;
@@
-144,7
+144,7
@@
static int __init txx9wdt_probe(struct platform_device *dev)
return 0;
exit:
if (txx9_imclk) {
return 0;
exit:
if (txx9_imclk) {
- clk_disable(txx9_imclk);
+ clk_disable
_unprepare
(txx9_imclk);
clk_put(txx9_imclk);
}
return ret;
clk_put(txx9_imclk);
}
return ret;
@@
-153,7
+153,7
@@
exit:
static int __exit txx9wdt_remove(struct platform_device *dev)
{
watchdog_unregister_device(&txx9wdt);
static int __exit txx9wdt_remove(struct platform_device *dev)
{
watchdog_unregister_device(&txx9wdt);
- clk_disable(txx9_imclk);
+ clk_disable
_unprepare
(txx9_imclk);
clk_put(txx9_imclk);
return 0;
}
clk_put(txx9_imclk);
return 0;
}