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

ASoC: pxa: corgi: 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 9dd2bb3f

sound/soc/pxa/corgi.c

+23 −19
Original line number Diff line number Diff line
@@ -47,51 +47,55 @@ static int corgi_spk_func; 


static void corgi_ext_control(struct snd_soc_dapm_context *dapm)

{

	snd_soc_dapm_mutex_lock(dapm);



	/* set up jack connection */

	switch (corgi_jack_func) {

	case CORGI_HP:

		/* set = unmute headphone */

		gpio_set_value(CORGI_GPIO_MUTE_L, 1);

		gpio_set_value(CORGI_GPIO_MUTE_R, 1);

		snd_soc_dapm_disable_pin(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin(dapm, "Line Jack");

		snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");

		break;

	case CORGI_MIC:

		/* reset = mute headphone */

		gpio_set_value(CORGI_GPIO_MUTE_L, 0);

		gpio_set_value(CORGI_GPIO_MUTE_R, 0);

		snd_soc_dapm_enable_pin(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin(dapm, "Line Jack");

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin(dapm, "Headset Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");

		break;

	case CORGI_LINE:

		gpio_set_value(CORGI_GPIO_MUTE_L, 0);

		gpio_set_value(CORGI_GPIO_MUTE_R, 0);

		snd_soc_dapm_disable_pin(dapm, "Mic Jack");

		snd_soc_dapm_enable_pin(dapm, "Line Jack");

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Line Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");

		break;

	case CORGI_HEADSET:

		gpio_set_value(CORGI_GPIO_MUTE_L, 0);

		gpio_set_value(CORGI_GPIO_MUTE_R, 1);

		snd_soc_dapm_enable_pin(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin(dapm, "Line Jack");

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_enable_pin(dapm, "Headset Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack");

		break;

	}



	if (corgi_spk_func == CORGI_SPK_ON)

		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");



	/* signal a DAPM event */

	snd_soc_dapm_sync(dapm);

	snd_soc_dapm_sync_unlocked(dapm);



	snd_soc_dapm_mutex_unlock(dapm);

}



static int corgi_startup(struct snd_pcm_substream *substream)