---

yaml --- r: 296027 b: refs/heads/master c: 8186064 h: refs/heads/master i: 296025: 5da5163 296023: 85ec7de v: v3
git-mirror · Feb 1, 2012 · 39d4553 · 39d4553
1 parent 1b7f3f7
commit 39d4553
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: d816c6e644fd5b63fa7dbf865360db218753a212
+refs/heads/master: 8186064cfc143e6a103670731af75114ebfe1ba4
diff --git a/trunk/arch/arm/mach-imx/mach-mx31moboard.c b/trunk/arch/arm/mach-imx/mach-mx31moboard.c
@@ -507,7 +507,7 @@ static void mx31moboard_poweroff(void)
 	struct clk *clk = clk_get_sys("imx2-wdt.0", NULL);
 
 	if (!IS_ERR(clk))
-		clk_enable(clk);
+		clk_prepare_enable(clk);
 
 	mxc_iomux_mode(MX31_PIN_WATCHDOG_RST__WATCHDOG_RST);