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

Commit 0b7dd6ad authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 2af8de8c

sound/soc/codecs/wm8962.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -2366,16 +2366,15 @@ static int sysclk_event(struct snd_soc_dapm_widget *w, 




			snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,

			snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,

					    WM8962_FLL_ENA, WM8962_FLL_ENA);

					    WM8962_FLL_ENA, WM8962_FLL_ENA);

			if (wm8962->irq) {



			timeout = msecs_to_jiffies(5);

			timeout = msecs_to_jiffies(5);

			timeout = wait_for_completion_timeout(&wm8962->fll_lock,

			timeout = wait_for_completion_timeout(&wm8962->fll_lock,

							      timeout);

							      timeout);





				if (timeout == 0)

			if (wm8962->irq && timeout == 0)

				dev_err(codec->dev,

				dev_err(codec->dev,

					"Timed out starting FLL\n");

					"Timed out starting FLL\n");

		}

		}

		}

		break;

		break;





	case SND_SOC_DAPM_POST_PMD:

	case SND_SOC_DAPM_POST_PMD: