From 0de77388926744832aff0768addf9d695602dccf Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 25 Apr 2012 16:35:16 +0200 Subject: [PATCH] --- yaml --- r: 308235 b: refs/heads/master c: 4ec8c7f52654cdbb13770d04dc76f9a4615cd4e1 h: refs/heads/master i: 308233: 7984e9a6d7c3caf32215c8aa651c5e440d381f7e 308231: 4288726c470612181951b87e6e27211f1e6d9603 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-imxdi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 71b58ff4eac1..afdb2ff7849d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fa030a43ddb0d8fe3f2530d6162c11a3b3d31de +refs/heads/master: 4ec8c7f52654cdbb13770d04dc76f9a4615cd4e1 diff --git a/trunk/drivers/rtc/rtc-imxdi.c b/trunk/drivers/rtc/rtc-imxdi.c index d93a9608b1f0..891cd6c61d0a 100644 --- a/trunk/drivers/rtc/rtc-imxdi.c +++ b/trunk/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;