From 9a80afaa5e14c4cf372e8653187b51fc34eea3e8 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Mon, 29 Apr 2013 16:20:24 -0700 Subject: [PATCH] --- yaml --- r: 365811 b: refs/heads/master c: 1a3224f141365baab8861d0852ac134bd1d6877b h: refs/heads/master i: 365809: c02599f4794320f3cfbf06c8e74b188ee75724a5 365807: 4362cf4f273a065354fffeae7db546024a0d093e v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-s3c.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a34a484bfc8b..45077a64f60b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e005715efaf674660ae59af83b13822567e3a758 +refs/heads/master: 1a3224f141365baab8861d0852ac134bd1d6877b diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c index 653a4dcbfe7d..8e96c00936be 100644 --- a/trunk/drivers/rtc/rtc-s3c.c +++ b/trunk/drivers/rtc/rtc-s3c.c @@ -426,6 +426,7 @@ static int s3c_rtc_remove(struct platform_device *dev) s3c_rtc_setaie(&dev->dev, 0); + clk_unprepare(rtc_clk); rtc_clk = NULL; return 0; @@ -494,7 +495,7 @@ static int s3c_rtc_probe(struct platform_device *pdev) return ret; } - clk_enable(rtc_clk); + clk_prepare_enable(rtc_clk); /* check to see if everything is setup correctly */ @@ -573,7 +574,7 @@ static int s3c_rtc_probe(struct platform_device *pdev) err_nortc: s3c_rtc_enable(pdev, 0); - clk_disable(rtc_clk); + clk_disable_unprepare(rtc_clk); return ret; }