From 56f7ae97f7498f7b4c24f7230046a82f0945db56 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Tue, 20 Dec 2011 14:15:44 +0800
Subject: [PATCH] --- yaml --- r: 281953 b: refs/heads/master c:
 67939b22dadd6c5cbf7a4abe9eaec3a8415569a7 h: refs/heads/master i:   281951:
 742466116803cc7ef1471644c3c60b59c4302d92 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/soc/mxs/mxs-saif.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e61f92d34049..655f05aadc52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca4c22d391b8a5ac2b79135213ca68abc7aeb984
+refs/heads/master: 67939b22dadd6c5cbf7a4abe9eaec3a8415569a7
diff --git a/trunk/sound/soc/mxs/mxs-saif.c b/trunk/sound/soc/mxs/mxs-saif.c
index 76dc74d24fc2..ef1abb53af95 100644
--- a/trunk/sound/soc/mxs/mxs-saif.c
+++ b/trunk/sound/soc/mxs/mxs-saif.c
@@ -210,7 +210,7 @@ int mxs_saif_put_mclk(unsigned int saif_id)
 		return -EBUSY;
 	}
 
-	clk_disable(saif->clk);
+	clk_disable_unprepare(saif->clk);
 
 	/* disable MCLK output */
 	__raw_writel(BM_SAIF_CTRL_CLKGATE,
@@ -264,7 +264,7 @@ int mxs_saif_get_mclk(unsigned int saif_id, unsigned int mclk,
 	if (ret)
 		return ret;
 
-	ret = clk_enable(saif->clk);
+	ret = clk_prepare_enable(saif->clk);
 	if (ret)
 		return ret;