Unverified Commit 1e060a45 authored Apr 21, 2020 by Shengjiu Wang Committed by Mark Brown Apr 21, 2020

ASoC: wm8960: Fix wrong clock after suspend & resume



After suspend & resume, wm8960_hw_params may be called when
bias_level is not SND_SOC_BIAS_ON, then wm8960_configure_clocking
is not called. But if sample rate is changed at that time, then
the output clock rate will be not correct.

So judgement of bias_level is SND_SOC_BIAS_ON in wm8960_hw_params
is not necessary and it causes above issue.

Fixes: 3176bf2d ("ASoC: wm8960: update pll and clock setting function")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/1587468525-27514-1-git-send-email-shengjiu.wang@nxp.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 9bff3d30

sound/soc/codecs/wm8960.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -860,8 +860,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,

		wm8960->is_stream_in_use[tx] = true;

		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON &&
		!wm8960->is_stream_in_use[!tx])
		if (!wm8960->is_stream_in_use[!tx])
		return wm8960_configure_clocking(component);

		return 0;

Admin message