From 54daa4990cdc7ca205ab68fb82f6edf51b1055c5 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@st.com>
Date: Mon, 16 Apr 2012 13:56:18 +0530
Subject: [PATCH] --- yaml --- r: 308269 b: refs/heads/master c:
 f8abc080d33e69dfa2c3dd0f84c31832e2679091 h: refs/heads/master i:   308267:
 826e3219781e20df16369969024c785399a9c5da v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/plat-spear/time.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c26a5974caea..dde51a6974cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a45896bd3a4b7beb571fa704efa7c2782b791093
+refs/heads/master: f8abc080d33e69dfa2c3dd0f84c31832e2679091
diff --git a/trunk/arch/arm/plat-spear/time.c b/trunk/arch/arm/plat-spear/time.c
index abb5bdecd509..1c94989d725f 100644
--- a/trunk/arch/arm/plat-spear/time.c
+++ b/trunk/arch/arm/plat-spear/time.c
@@ -219,10 +219,10 @@ void __init spear_setup_timer(void)
 		goto err_iomap;
 	}
 
-	ret = clk_enable(gpt_clk);
+	ret = clk_prepare_enable(gpt_clk);
 	if (ret < 0) {
-		pr_err("%s:couldn't enable gpt clock\n", __func__);
-		goto err_clk;
+		pr_err("%s:couldn't prepare-enable gpt clock\n", __func__);
+		goto err_prepare_enable_clk;
 	}
 
 	spear_clockevent_init();
@@ -230,7 +230,7 @@ void __init spear_setup_timer(void)
 
 	return;
 
-err_clk:
+err_prepare_enable_clk:
 	clk_put(gpt_clk);
 err_iomap:
 	iounmap(gpt_base);