diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 09:40:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 09:40:56 +0000 |
| commit | 7a87ac1f66800460e82b7ff3286dfec1c5bb9b84 (patch) | |
| tree | 5907ca9eee5d390d6817b5625780aa1505a6a132 /sound/soc/pxa/magician.c | |
| parent | a9576cbbbafa2c687121638dadebfb136562a522 (diff) | |
| parent | e95d73c437a09e7febea18f8e998f958ef6d7a72 (diff) | |
| download | talos-obmc-linux-7a87ac1f66800460e82b7ff3286dfec1c5bb9b84.tar.gz talos-obmc-linux-7a87ac1f66800460e82b7ff3286dfec1c5bb9b84.zip | |
Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'sound/soc/pxa/magician.c')
| -rw-r--r-- | sound/soc/pxa/magician.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index aeb08f5f3e1c..41ab6678b65d 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -45,27 +45,31 @@ static void magician_ext_control(struct snd_soc_codec *codec) { struct snd_soc_dapm_context *dapm = &codec->dapm; + snd_soc_dapm_mutex_lock(dapm); + if (magician_spk_switch) - snd_soc_dapm_enable_pin(dapm, "Speaker"); + snd_soc_dapm_enable_pin_unlocked(dapm, "Speaker"); else - snd_soc_dapm_disable_pin(dapm, "Speaker"); + snd_soc_dapm_disable_pin_unlocked(dapm, "Speaker"); if (magician_hp_switch) - snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); + snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack"); else - snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); + snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack"); switch (magician_in_sel) { case MAGICIAN_MIC: - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_enable_pin(dapm, "Call Mic"); + snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Mic"); + snd_soc_dapm_enable_pin_unlocked(dapm, "Call Mic"); break; case MAGICIAN_MIC_EXT: - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - snd_soc_dapm_enable_pin(dapm, "Headset Mic"); + snd_soc_dapm_disable_pin_unlocked(dapm, "Call Mic"); + snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Mic"); break; } - snd_soc_dapm_sync(dapm); + snd_soc_dapm_sync_unlocked(dapm); + + snd_soc_dapm_mutex_unlock(dapm); } static int magician_startup(struct snd_pcm_substream *substream) |
