OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
60178b6
)
watchdog imx2: prepare clk before enabling it
author
Sascha Hauer
<s.hauer@pengutronix.de>
Tue, 3 Apr 2012 10:34:57 +0000
(12:34 +0200)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Wed, 25 Apr 2012 15:03:42 +0000
(17:03 +0200)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
drivers/watchdog/imx2_wdt.c
patch
|
blob
|
history
diff --git
a/drivers/watchdog/imx2_wdt.c
b/drivers/watchdog/imx2_wdt.c
index
7a2b734
..
bcfab2b
100644
(file)
--- a/
drivers/watchdog/imx2_wdt.c
+++ b/
drivers/watchdog/imx2_wdt.c
@@
-121,7
+121,7
@@
static void imx2_wdt_start(void)
{
if (!test_and_set_bit(IMX2_WDT_STATUS_STARTED, &imx2_wdt.status)) {
/* at our first start we enable clock and do initialisations */
- clk_enable(imx2_wdt.clk);
+ clk_
prepare_
enable(imx2_wdt.clk);
imx2_wdt_setup();
} else /* delete the timer that pings the watchdog after close */