diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
| commit | 4b57895522b150966eebcf18f929e1c522d90bb9 (patch) | |
| tree | 0852de7700b4d6dfeb091ad190c0599e32b6df46 /sound/soc/codecs/wm9713.c | |
| parent | 2914b7004b932a7ddee97c026ebafd16ab841320 (diff) | |
| parent | cc76e7def0fa27b5f42aea54e34c96b4bddaf30a (diff) | |
| download | op-kernel-dev-4b57895522b150966eebcf18f929e1c522d90bb9.zip op-kernel-dev-4b57895522b150966eebcf18f929e1c522d90bb9.tar.gz | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 1b20b8d..89cd2d6 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) |
