xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: pxa: tosa: Update locking around use of DAPM pin API

Browse Source 
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:
Charles Keepax
2014-02-18 15:22:28 +00:00
committed by Mark Brown
parent 1845a7255a
commit 26e24ddce7
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sound/soc/pxa/tosa.c
View File

@@ -48,31 +48,35 @@ static void tosa_ext_control(struct snd_soc_codec *codec)
{ {
struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_dapm_context *dapm = &codec->dapm;
snd_soc_dapm_mutex_lock(dapm);
/* set up jack connection */ /* set up jack connection */
switch (tosa_jack_func) { switch (tosa_jack_func) {
case TOSA_HP: case TOSA_HP:
snd_soc_dapm_disable_pin(dapm, "Mic (Internal)"); snd_soc_dapm_disable_pin_unlocked(dapm, "Mic (Internal)");
snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack");
snd_soc_dapm_disable_pin(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
break; break;
case TOSA_MIC_INT: case TOSA_MIC_INT:
snd_soc_dapm_enable_pin(dapm, "Mic (Internal)"); snd_soc_dapm_enable_pin_unlocked(dapm, "Mic (Internal)");
snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
snd_soc_dapm_disable_pin(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
break; break;
case TOSA_HEADSET: case TOSA_HEADSET:
snd_soc_dapm_disable_pin(dapm, "Mic (Internal)"); snd_soc_dapm_disable_pin_unlocked(dapm, "Mic (Internal)");
snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
snd_soc_dapm_enable_pin(dapm, "Headset Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack");
break; break;
} }
if (tosa_spk_func == TOSA_SPK_ON) if (tosa_spk_func == TOSA_SPK_ON)
snd_soc_dapm_enable_pin(dapm, "Speaker"); snd_soc_dapm_enable_pin_unlocked(dapm, "Speaker");
else else
snd_soc_dapm_disable_pin(dapm, "Speaker"); snd_soc_dapm_disable_pin_unlocked(dapm, "Speaker");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync_unlocked(dapm);
snd_soc_dapm_mutex_unlock(dapm);
} }
static int tosa_startup(struct snd_pcm_substream *substream) static int tosa_startup(struct snd_pcm_substream *substream)