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/88pm860x-codec.c | |
| parent | 2914b7004b932a7ddee97c026ebafd16ab841320 (diff) | |
| parent | cc76e7def0fa27b5f42aea54e34c96b4bddaf30a (diff) | |
| download | linux-4b57895522b150966eebcf18f929e1c522d90bb9.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index f62da48eda9a..38b3dad9d48a 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1140,7 +1140,7 @@ static int pm860x_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) { /* Enable Audio PLL & Audio section */ data = AUDIO_PLL | AUDIO_SECTION_ON; pm860x_reg_write(pm860x->i2c, REG_MISC2, data); @@ -1156,7 +1156,6 @@ static int pm860x_set_bias_level(struct snd_soc_codec *codec, pm860x_set_bits(pm860x->i2c, REG_MISC2, data, 0); break; } - codec->dapm.bias_level = level; return 0; } |