From 39d4553e4a52c2524f42fba4c62c1b24f20a94a9 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Tue, 15 Nov 2011 14:48:04 +0800 Subject: [PATCH] --- yaml --- r: 296027 b: refs/heads/master c: 8186064cfc143e6a103670731af75114ebfe1ba4 h: refs/heads/master i: 296025: 5da51639aa23bda6aa8ec05660914b7142e7ccaa 296023: 85ec7de031fa582b5377e155c80b55b391803419 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/mach-mx31moboard.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 91a70a758637..aa22dfb04bc2 100644 --- 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 index f225262b5c38..96e042d0c9a9 100644 --- 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);