From 5812c2b4b9f936f3a431ead2a4391459f4fbc3b9 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Thu, 8 Nov 2012 20:39:10 +0530
Subject: [PATCH] --- yaml --- r: 336308 b: refs/heads/master c:
 06960a1b5d55d77d799050d2f62970d36d34a606 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mmc/host/sdhci-spear.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a5224d81d8d0..037595cd24ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 257f9df12307cb0239196d9ec18e2af12c52435e
+refs/heads/master: 06960a1b5d55d77d799050d2f62970d36d34a606
diff --git a/trunk/drivers/mmc/host/sdhci-spear.c b/trunk/drivers/mmc/host/sdhci-spear.c
index fea8bf92efab..87a700944b7d 100644
--- a/trunk/drivers/mmc/host/sdhci-spear.c
+++ b/trunk/drivers/mmc/host/sdhci-spear.c
@@ -302,7 +302,7 @@ static int sdhci_suspend(struct device *dev)
 
 	ret = sdhci_suspend_host(host);
 	if (!ret)
-		clk_disable_unprepare(sdhci->clk);
+		clk_disable(sdhci->clk);
 
 	return ret;
 }
@@ -313,7 +313,7 @@ static int sdhci_resume(struct device *dev)
 	struct spear_sdhci *sdhci = dev_get_platdata(dev);
 	int ret;
 
-	ret = clk_prepare_enable(sdhci->clk);
+	ret = clk_enable(sdhci->clk);
 	if (ret) {
 		dev_dbg(dev, "Resume: Error enabling clock\n");
 		return ret;