diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-03 06:34:57 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 11:03:42 -0400 |
| commit | 4e7b6c9a6b4700cf121a0d5924f193db83cbd008 (patch) | |
| tree | fc9cfafc099ec701ad48d76f1b458a4169e54bee /drivers/watchdog | |
| parent | 60178b6329259457013d0e39cbee22aec0230dfb (diff) | |
watchdog imx2: prepare clk before enabling it
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/watchdog')
| -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) | |||
| 121 | { | 121 | { |
| 122 | if (!test_and_set_bit(IMX2_WDT_STATUS_STARTED, &imx2_wdt.status)) { | 122 | if (!test_and_set_bit(IMX2_WDT_STATUS_STARTED, &imx2_wdt.status)) { |
| 123 | /* at our first start we enable clock and do initialisations */ | 123 | /* at our first start we enable clock and do initialisations */ |
| 124 | clk_enable(imx2_wdt.clk); | 124 | clk_prepare_enable(imx2_wdt.clk); |
| 125 | 125 | ||
| 126 | imx2_wdt_setup(); | 126 | imx2_wdt_setup(); |
| 127 | } else /* delete the timer that pings the watchdog after close */ | 127 | } else /* delete the timer that pings the watchdog after close */ |