ASoC: omap: rx51: Update locking around use of DAPM pin API
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Tue, 18 Feb 2014 15:22:24 +0000 (15:22 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 20 Feb 2014 10:22:59 +0000 (19:22 +0900)
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>
sound/soc/omap/rx51.c

index 611179c3bca48c4ca0e9128f3ab5016766373e44..7fb3d4b103701c5a38a6bf25d4dc75b2fa32543c 100644 (file)
@@ -74,26 +74,30 @@ static void rx51_ext_control(struct snd_soc_dapm_context *dapm)
                break;
        }
 
+       snd_soc_dapm_mutex_lock(dapm);
+
        if (rx51_spk_func)
-               snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+               snd_soc_dapm_enable_pin_unlocked(dapm, "Ext Spk");
        else
-               snd_soc_dapm_disable_pin(dapm, "Ext Spk");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "Ext Spk");
        if (rx51_dmic_func)
-               snd_soc_dapm_enable_pin(dapm, "DMic");
+               snd_soc_dapm_enable_pin_unlocked(dapm, "DMic");
        else
-               snd_soc_dapm_disable_pin(dapm, "DMic");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "DMic");
        if (hp)
-               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");
        if (hs)
-               snd_soc_dapm_enable_pin(dapm, "HS Mic");
+               snd_soc_dapm_enable_pin_unlocked(dapm, "HS Mic");
        else
-               snd_soc_dapm_disable_pin(dapm, "HS Mic");
+               snd_soc_dapm_disable_pin_unlocked(dapm, "HS Mic");
 
        gpio_set_value(RX51_TVOUT_SEL_GPIO, tvout);
 
-       snd_soc_dapm_sync(dapm);
+       snd_soc_dapm_sync_unlocked(dapm);
+
+       snd_soc_dapm_mutex_unlock(dapm);
 }
 
 static int rx51_startup(struct snd_pcm_substream *substream)