diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-03 12:34:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 17:03:42 +0200 |
| commit | 4e7b6c9a6b4700cf121a0d5924f193db83cbd008 (patch) | |
| tree | fc9cfafc099ec701ad48d76f1b458a4169e54bee /drivers/watchdog/imx2_wdt.c | |
| parent | 60178b6329259457013d0e39cbee22aec0230dfb (diff) | |
| download | blackbird-op-linux-4e7b6c9a6b4700cf121a0d5924f193db83cbd008.tar.gz blackbird-op-linux-4e7b6c9a6b4700cf121a0d5924f193db83cbd008.zip | |
watchdog imx2: prepare clk before enabling it
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/watchdog/imx2_wdt.c')
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 7a2b734fcdc7..bcfab2b00ad2 100644 --- 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 */ |
