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

Commit 02afc6a2 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm8996: Update locking around use of DAPM pin API 



The pin updates in this driver look like they are intended to be done
atomically, update to do so.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent babce821

sound/soc/codecs/wm8996.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -2251,6 +2251,7 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, 
		  wm8996_polarity_fn polarity_cb)

		  wm8996_polarity_fn polarity_cb)

{

{

	struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);

	struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = &codec->dapm;





	wm8996->jack = jack;

	wm8996->jack = jack;

	wm8996->detecting = true;

	wm8996->detecting = true;
@@ -2267,8 +2268,12 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, 
			    WM8996_MICB2_DISCH, 0);

			    WM8996_MICB2_DISCH, 0);





	/* LDO2 powers the microphones, SYSCLK clocks detection */

	/* LDO2 powers the microphones, SYSCLK clocks detection */

	snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2");

	snd_soc_dapm_mutex_lock(dapm);

	snd_soc_dapm_force_enable_pin(&codec->dapm, "SYSCLK");



	snd_soc_dapm_force_enable_pin_unlocked(dapm, "LDO2");

	snd_soc_dapm_force_enable_pin_unlocked(dapm, "SYSCLK");



	snd_soc_dapm_mutex_unlock(dapm);





	/* We start off just enabling microphone detection - even a

	/* We start off just enabling microphone detection - even a

	 * plain headphone will trigger detection.

	 * plain headphone will trigger detection.