diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-04 08:16:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-04 11:23:50 +0100 |
| commit | ec02995adad5a7b428f46c1a87fae1bc93d6dfe3 (patch) | |
| tree | ec1f6ec14f61ecc1beac237710c3f8209004c04a /sound/soc | |
| parent | 695594f1b79d3b88e99e28f06afaab32c4d65853 (diff) | |
| download | linux-3.10-ec02995adad5a7b428f46c1a87fae1bc93d6dfe3.tar.gz linux-3.10-ec02995adad5a7b428f46c1a87fae1bc93d6dfe3.tar.bz2 linux-3.10-ec02995adad5a7b428f46c1a87fae1bc93d6dfe3.zip | |
ASoC: dapm: Bodge for lack of a widely available clk API
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a66379accec..39e8c2fdf50 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1011,12 +1011,14 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w, if (!w->clk) return -EIO; +#ifdef CONFIG_HAVE_CLK if (SND_SOC_DAPM_EVENT_ON(event)) { return clk_enable(w->clk); } else { clk_disable(w->clk); return 0; } +#endif } EXPORT_SYMBOL_GPL(dapm_clock_event); @@ -2902,6 +2904,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, } break; case snd_soc_dapm_clock_supply: +#ifdef CONFIG_HAVE_CLK w->clk = devm_clk_get(dapm->dev, w->name); if (IS_ERR(w->clk)) { ret = PTR_ERR(w->clk); @@ -2909,6 +2912,9 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, w->name, ret); return NULL; } +#else + return NULL; +#endif break; default: break; |