summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm9713.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-05 19:54:45 +0200
committerMark Brown <broonie@kernel.org>2015-06-05 19:54:45 +0200
commit4b57895522b150966eebcf18f929e1c522d90bb9 (patch)
tree0852de7700b4d6dfeb091ad190c0599e32b6df46 /sound/soc/codecs/wm9713.c
parentMerge remote-tracking branch 'asoc/topic/core' into asoc-next (diff)
parentASoC: dapm: fix build errors for missing snd_soc_dapm_new_control symbol (diff)
downloadlinux-4b57895522b150966eebcf18f929e1c522d90bb9.tar.xz
linux-4b57895522b150966eebcf18f929e1c522d90bb9.zip
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm9713.c')
-rw-r--r--sound/soc/codecs/wm9713.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 1b20b8d2b15d..89cd2d6f57c0 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1171,7 +1171,6 @@ static int wm9713_set_bias_level(struct snd_soc_codec *codec,
ac97_write(codec, AC97_POWERDOWN, 0xffff);
break;
}
- codec->dapm.bias_level = level;
return 0;
}
@@ -1201,7 +1200,7 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec)
if (ret < 0)
return ret;
- wm9713_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+ snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* do we need to re-start the PLL ? */
if (wm9713->pll_in)