Merge remote-tracking branches 'asoc/topic/intel' and 'asoc/topic/max98090' into...

[mirror_ubuntu-artful-kernel.git] / sound / soc / codecs / max9850.c

diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index 10f8e47ce2c28604a1d8cfdbe87b871d1e029290..481d58f1cb3f6b543b5e0fa320dd39103c992bd8 100644 (file)
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -252,7 +252,7 @@ static int max9850_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) {
                        ret = regcache_sync(max9850->regmap);
                        if (ret) {
                                dev_err(codec->dev,
@@ -264,7 +264,6 @@ static int max9850_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_OFF:
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }