From: Fabio Baltieri <fabio.baltieri@linaro.org>
Date: Tue, 30 Apr 2013 14:09:52 +0000 (+0200)
Subject: ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare
X-Git-Tag: android-x86-4.4-r1~782^2~10^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=37c1b9273fefe90e45c7d01ba4209e42d5e3e058;p=android-x86%2Fkernel.git

ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare

Update dapm_clock_event to use clk_prepare_enable and
clk_disable_unprepare.

Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d6d9ba2e6916..41b8b8ef4872 100644
--- a/sound/soc/soc-dapm.c
+++ b/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