Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / sta529.c

diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index b0f436d101253419dccdbd15d6abe694d383c2a7..4f70378b2cfb4095321f6793dd7d0277851c2ef0 100644 (file)
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -165,7 +165,7 @@ static int sta529_set_bias_level(struct snd_soc_codec *codec, enum
                                FFX_CLK_ENB);
                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)
                        regcache_sync(sta529->regmap);
                snd_soc_update_bits(codec, STA529_FFXCFG0,
                                        POWER_CNTLMSAK, POWER_STDBY);
@@ -179,12 +179,6 @@ static int sta529_set_bias_level(struct snd_soc_codec *codec, enum
                break;
        }
 
-       /*
-        * store the label for powers down audio subsystem for suspend.This is
-        * used by soc core layer
-        */
-       codec->dapm.bias_level = level;
-
        return 0;
 
 }