---

yaml --- r: 375228 b: refs/heads/master c: 57669ea h: refs/heads/master v: v3
git-mirror · May 3, 2013 · eda8ead · eda8ead
1 parent 32eecd3
commit eda8ead
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: df4a4eece78b484ea3c29aa1f9e9a03fcbb56c8b
+refs/heads/master: 57669eaab2e9d347b1063fd57038ba26afba5882
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -1070,9 +1070,9 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w,
 
 #ifdef CONFIG_HAVE_CLK
 	if (SND_SOC_DAPM_EVENT_ON(event)) {
-		return clk_enable(w->clk);
+		return clk_prepare_enable(w->clk);
 	} else {
-		clk_disable(w->clk);
+		clk_disable_unprepare(w->clk);
 		return 0;
 	}
 #endif