Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/topic...

[deliverable/linux.git] / sound / soc / pxa / magician.c

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index aeb08f5f3e1cc3bea030f38aedf2d785d4653b81..41ab6678b65d17035ededcae69f59ffe1a3aa19f 100644 (file)
--- 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)