Commit f71b0fbe authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: pxa: magician: 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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 4d9e7348

sound/soc/pxa/magician.c

+13 −9
Original line number Diff line number Diff line
@@ -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)