From eda8ead396d8c3c064549173d5c5a77c7d9caa0d Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 3 May 2013 09:30:28 +0100
Subject: [PATCH] --- yaml --- r: 375228 b: refs/heads/master c:
 57669eaab2e9d347b1063fd57038ba26afba5882 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1cafb31128a3..0bc0bbfd3d69 100644
--- 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
index d6d9ba2e6916..41b8b8ef4872 100644
--- 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