mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
babce8211b
commit
02afc6a238
1 changed files with 7 additions and 2 deletions
|
@ -2251,6 +2251,7 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
|
|||
wm8996_polarity_fn polarity_cb)
|
||||
{
|
||||
struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
|
||||
wm8996->jack = jack;
|
||||
wm8996->detecting = true;
|
||||
|
@ -2267,8 +2268,12 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
|
|||
WM8996_MICB2_DISCH, 0);
|
||||
|
||||
/* LDO2 powers the microphones, SYSCLK clocks detection */
|
||||
snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2");
|
||||
snd_soc_dapm_force_enable_pin(&codec->dapm, "SYSCLK");
|
||||
snd_soc_dapm_mutex_lock(dapm);
|
||||
|
||||
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
|
||||
* plain headphone will trigger detection.
|
||||
|
|
Loading…
Reference in a new issue