From b26e61f95b76968230b26165c9a2e588b274fc38 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Thu, 4 Oct 2012 17:14:07 -0700
Subject: [PATCH] --- yaml --- r: 330114 b: refs/heads/master c:
 828296debf7853752e47b6abfa608ab0172e53ec h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/rtc/rtc-coh901331.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f1eb59b3547c..f385e5e387a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90829c089ef622e54ce1153eb6dcda9ce98cb7c2
+refs/heads/master: 828296debf7853752e47b6abfa608ab0172e53ec
diff --git a/trunk/drivers/rtc/rtc-coh901331.c b/trunk/drivers/rtc/rtc-coh901331.c
index 76b2156d3c62..c8115b83e5ab 100644
--- a/trunk/drivers/rtc/rtc-coh901331.c
+++ b/trunk/drivers/rtc/rtc-coh901331.c
@@ -276,8 +276,7 @@ static void coh901331_shutdown(struct platform_device *pdev)
 
 	clk_enable(rtap->clk);
 	writel(0, rtap->virtbase + COH901331_IRQ_MASK);
-	clk_disable(rtap->clk);
-	clk_unprepare(rtap->clk);
+	clk_disable_unprepare(rtap->clk);
 }
 
 static struct platform_driver coh901331_driver = {