diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 16:35:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 17:03:44 +0200 |
| commit | 4ec8c7f52654cdbb13770d04dc76f9a4615cd4e1 (patch) | |
| tree | 3a5b1316ebc0e3d82de56e7cbb89217e87ef1669 /drivers/rtc | |
| parent | dmaengine i.MX ipu: clk_prepare/unprepare clock (diff) | |
| download | linux-4ec8c7f52654cdbb13770d04dc76f9a4615cd4e1.tar.xz linux-4ec8c7f52654cdbb13770d04dc76f9a4615cd4e1.zip | |
rtc: imx dryice: Add missing clk_prepare
prepare the clock before enabling it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-imxdi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c index d93a9608b1f0..891cd6c61d0a 100644 --- a/drivers/rtc/rtc-imxdi.c +++ b/drivers/rtc/rtc-imxdi.c @@ -405,7 +405,7 @@ static int dryice_rtc_probe(struct platform_device *pdev) imxdi->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(imxdi->clk)) return PTR_ERR(imxdi->clk); - clk_enable(imxdi->clk); + clk_prepare_enable(imxdi->clk); /* * Initialize dryice hardware @@ -470,7 +470,7 @@ static int dryice_rtc_probe(struct platform_device *pdev) return 0; err: - clk_disable(imxdi->clk); + clk_disable_unprepare(imxdi->clk); clk_put(imxdi->clk); return rc; @@ -487,7 +487,7 @@ static int __devexit dryice_rtc_remove(struct platform_device *pdev) rtc_device_unregister(imxdi->rtc); - clk_disable(imxdi->clk); + clk_disable_unprepare(imxdi->clk); clk_put(imxdi->clk); return 0; |