diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-19 10:17:19 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-19 10:17:19 (GMT) |
| commit | 89a6192049050035cbd779d35686cbf29ca9184f (patch) | |
| tree | f63c3344dc7ce4da5589d043d6135c7ff81508fd /sound/soc/codecs/wm8580.c | |
| parent | f9f55e31f8a537b7eaccc4fdb243cff938fa428c (diff) | |
| parent | cc76e7def0fa27b5f42aea54e34c96b4bddaf30a (diff) | |
| download | linux-89a6192049050035cbd779d35686cbf29ca9184f.tar.xz | |
Merge branches 'topic/adsp' and 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-arizona
Diffstat (limited to 'sound/soc/codecs/wm8580.c')
| -rw-r--r-- | sound/soc/codecs/wm8580.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 0a887c5..759a792 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -795,7 +795,7 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec, break; case SND_SOC_BIAS_STANDBY: - if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { /* Power up and get individual control of the DACs */ snd_soc_update_bits(codec, WM8580_PWRDN1, WM8580_PWRDN1_PWDN | @@ -812,7 +812,6 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec, WM8580_PWRDN1_PWDN, WM8580_PWRDN1_PWDN); break; } - codec->dapm.bias_level = level; return 0; } |