ASoC: pxa: tosa: 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>

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 1d9c2ed223bc089b233b748485c7b5a2e387ee49..2a4b438ce97c92856b83bcfa2358550b94e27054 100644 (file)
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -48,31 +48,35 @@ static void tosa_ext_control(struct snd_soc_codec *codec)
 {
        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
+       snd_soc_dapm_mutex_lock(dapm);
+
        /* set up jack connection */
        switch (tosa_jack_func) {
        case TOSA_HP:
-               snd_soc_dapm_disable_pin(dapm, "Mic (Internal)");
-               snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-               snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "Mic (Internal)");
+               snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
                break;
        case TOSA_MIC_INT:
-               snd_soc_dapm_enable_pin(dapm, "Mic (Internal)");
-               snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
-               snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+               snd_soc_dapm_enable_pin_unlocked(dapm, "Mic (Internal)");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
                break;
        case TOSA_HEADSET:
-               snd_soc_dapm_disable_pin(dapm, "Mic (Internal)");
-               snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
-               snd_soc_dapm_enable_pin(dapm, "Headset Jack");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "Mic (Internal)");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
+               snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack");
                break;
        }
 
        if (tosa_spk_func == TOSA_SPK_ON)
-               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");
+
+       snd_soc_dapm_sync_unlocked(dapm);
 
-       snd_soc_dapm_sync(dapm);
+       snd_soc_dapm_mutex_unlock(dapm);
 }
 
 static int tosa_startup(struct snd_pcm_substream *substream)