---

yaml --- r: 308232 b: refs/heads/master c: 4e7b6c9 h: refs/heads/master v: v3
git-mirror · Apr 25, 2012 · 6390e76 · 6390e76
1 parent 4288726
commit 6390e76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60178b6329259457013d0e39cbee22aec0230dfb
+refs/heads/master: 4e7b6c9a6b4700cf121a0d5924f193db83cbd008
diff --git a/trunk/drivers/watchdog/imx2_wdt.c b/trunk/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 */