---

yaml --- r: 281953 b: refs/heads/master c: 67939b2 h: refs/heads/master i: 281951: 7424661 v: v3
git-mirror · Dec 28, 2011 · 56f7ae9 · 56f7ae9
1 parent 06cfe88
commit 56f7ae9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;