diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-19 12:17:19 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-19 12:17:19 +0200 |
| commit | 89a6192049050035cbd779d35686cbf29ca9184f (patch) | |
| tree | f63c3344dc7ce4da5589d043d6135c7ff81508fd /sound/soc/codecs/rt5651.c | |
| parent | ASoC: wm_adsp: Add basic debugfs entries (diff) | |
| parent | ASoC: dapm: fix build errors for missing snd_soc_dapm_new_control symbol (diff) | |
| download | linux-89a6192049050035cbd779d35686cbf29ca9184f.tar.xz linux-89a6192049050035cbd779d35686cbf29ca9184f.zip | |
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/rt5651.c')
| -rw-r--r-- | sound/soc/codecs/rt5651.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 9f4c7be6d798..a3506e193abc 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1571,7 +1571,7 @@ static int rt5651_set_bias_level(struct snd_soc_codec *codec, { switch (level) { case SND_SOC_BIAS_PREPARE: - if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) { + if (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) { snd_soc_update_bits(codec, RT5651_PWR_ANLG1, RT5651_PWR_VREF1 | RT5651_PWR_MB | RT5651_PWR_BG | RT5651_PWR_VREF2, @@ -1604,7 +1604,6 @@ static int rt5651_set_bias_level(struct snd_soc_codec *codec, default: break; } - codec->dapm.bias_level = level; return 0; } @@ -1625,7 +1624,7 @@ static int rt5651_probe(struct snd_soc_codec *codec) RT5651_PWR_FV1 | RT5651_PWR_FV2, RT5651_PWR_FV1 | RT5651_PWR_FV2); - rt5651_set_bias_level(codec, SND_SOC_BIAS_OFF); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); return 0; } |