]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
watchdog imx2: prepare clk before enabling it
authorSascha Hauer <s.hauer@pengutronix.de>
Tue, 3 Apr 2012 10:34:57 +0000 (12:34 +0200)
committerSascha 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

index 7a2b734fcdc78f89c3c7f1b9a3eb0f3eb005842c..bcfab2b00ad20ae5c1e72fbf0e2809aa02cfdf2d 100644 (file)
@@ -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 */