Merge remote-tracking branch 'asoc/topic/rt5670' into asoc-next

[deliverable/linux.git] / sound / soc / codecs / da7213.c

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 9ec577f0edb4c061197e75b932f671c43577b208..238e48a3a4fe7bbda84b0aa8b6b6639e2434bdd6 100644 (file)
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1374,7 +1374,7 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_PREPARE:
                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 VMID reference & master bias */
                        snd_soc_update_bits(codec, DA7213_REFERENCES,
                                            DA7213_VMID_EN | DA7213_BIAS_EN,
@@ -1387,7 +1387,6 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec,
                                    DA7213_VMID_EN | DA7213_BIAS_EN, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }