ASoC: dapm: Check for bias level when powering down (7679e42e) · Commits · 戴 / test

Recent enhancements in the bias management means that we might not be in standby when the CODEC is idle and can have active widgets without being in full power mode but the shutdown functionality assumes these things. Add checks for the bias level at each stage so that we don't do transitions other than the ON->PREPARE->STANDBY->OFF ones that the drivers are expecting. Signed-off-by:

Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org

sound/soc/soc-dapm.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -3068,9 +3068,13 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
		* standby.
		*/
		if (powerdown) {
		snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_PREPARE);
		if (dapm->bias_level == SND_SOC_BIAS_ON)
		snd_soc_dapm_set_bias_level(dapm,
		SND_SOC_BIAS_PREPARE);
		dapm_seq_run(dapm, &down_list, 0, false);
		snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_STANDBY);
		if (dapm->bias_level == SND_SOC_BIAS_PREPARE)
		snd_soc_dapm_set_bias_level(dapm,
		SND_SOC_BIAS_STANDBY);
		}
		}

		@@ -3083,7 +3087,9 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card)

		list_for_each_entry(codec, &card->codec_dev_list, list) {
		soc_dapm_shutdown_codec(&codec->dapm);
		snd_soc_dapm_set_bias_level(&codec->dapm, SND_SOC_BIAS_OFF);
		if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
		snd_soc_dapm_set_bias_level(&codec->dapm,
		SND_SOC_BIAS_OFF);
		}
		}

Admin message