summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@linaro.org>2013-04-30 16:09:52 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-30 19:31:30 +0100
commit37c1b9273fefe90e45c7d01ba4209e42d5e3e058 (patch)
tree3babda6ef72c24ce46459c83e183e0f2a5d583fa /sound
parentc1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff)
downloadblackbird-op-linux-37c1b9273fefe90e45c7d01ba4209e42d5e3e058.tar.gz
blackbird-op-linux-37c1b9273fefe90e45c7d01ba4209e42d5e3e058.zip
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 2 insertions, 2 deletions
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
OpenPOWER on IntegriCloud