aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-05 05:44:23 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-05 05:44:23 -0400
commit165961efc03159631eadc086877704c7778ac356 (patch)
tree2cfcb9de47dfabc79bfee7ed9f0d0dcbc8396f22 /sound/soc
parent5eba8ec37fe8cfed4cacff56f9025b756cc43faa (diff)
ASoC: dapm: The clock API is even less consistent than thought
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 39e8c2fdf50e..7365fed1ba74 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2904,7 +2904,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
2904 } 2904 }
2905 break; 2905 break;
2906 case snd_soc_dapm_clock_supply: 2906 case snd_soc_dapm_clock_supply:
2907#ifdef CONFIG_HAVE_CLK 2907#ifdef CONFIG_CLKDEV_LOOKUP
2908 w->clk = devm_clk_get(dapm->dev, w->name); 2908 w->clk = devm_clk_get(dapm->dev, w->name);
2909 if (IS_ERR(w->clk)) { 2909 if (IS_ERR(w->clk)) {
2910 ret = PTR_ERR(w->clk); 2910 ret = PTR_ERR(w->clk);