Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4df0cb2f authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Clear any outstanding WM8962 FLL lock completions before waiting 



Ensure that we don't spuriously trigger early.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent f79e7ff8

sound/soc/codecs/wm8962.c

+4 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,8 @@ static int sysclk_event(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (fll) {

			try_wait_for_completion(&wm8962->fll_lock);



			snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,

					    WM8962_FLL_ENA, WM8962_FLL_ENA);

			if (wm8962->irq) {
@@ -3284,6 +3286,8 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, 
	snd_soc_write(codec, WM8962_FLL_CONTROL_7, fll_div.lambda);

	snd_soc_write(codec, WM8962_FLL_CONTROL_8, fll_div.n);



	try_wait_for_completion(&wm8962->fll_lock);



	snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,

			    WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK |

			    WM8962_FLL_ENA, fll1);