1 files changed, 28 insertions, 23 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index fc052d8247ff..04dbb5a38fa4 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -46,61 +46,66 @@ static int spitz_mic_gpio;
 static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
 {
+        snd_soc_dapm_mutex_lock(dapm);
        if (spitz_spk_func == SPITZ_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");
        /* set up jack connection */
        switch (spitz_jack_func) {
        case SPITZ_HP:
                /* enable and unmute hp jack, disable mic bias */
-                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
-                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");
-                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
-                snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack");
                gpio_set_value(SPITZ_GPIO_MUTE_L, 1);
                gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                break;
        case SPITZ_MIC:
                /* enable mic jack and bias, mute hp */
-                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
-                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
-                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
-                snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");
                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                break;
        case SPITZ_LINE:
                /* enable line jack, disable mic bias and mute hp */
-                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
-                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
-                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");
-                snd_soc_dapm_enable_pin(dapm, "Line Jack");
+                snd_soc_dapm_enable_pin_unlocked(dapm, "Line Jack");
                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                break;
        case SPITZ_HEADSET:
                /* enable and unmute headset jack enable mic bias, mute L hp */
-                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
-                snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");
-                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
-                snd_soc_dapm_enable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack");
                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                break;
        case SPITZ_HP_OFF:
                /* jack removed, everything off */
-                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
-                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
-                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");
-                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                break;
        }
-        snd_soc_dapm_sync(dapm);
+        snd_soc_dapm_sync_unlocked(dapm);
+        snd_soc_dapm_mutex_unlock(dapm);
 }
 static int spitz_startup(struct snd_pcm_substream *substream)

diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index fc052d8247ff..04dbb5a38fa4 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c
@@ -46,61 +46,66 @@ static int spitz_mic_gpio;
46		46
47	static void spitz_ext_control(struct snd_soc_dapm_context *dapm)	47	static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
48	{	48	{
		49	snd_soc_dapm_mutex_lock(dapm);
		50
49	if (spitz_spk_func == SPITZ_SPK_ON)	51	if (spitz_spk_func == SPITZ_SPK_ON)
50	snd_soc_dapm_enable_pin(dapm, "Ext Spk");	52	snd_soc_dapm_enable_pin_unlocked(dapm, "Ext Spk");
51	else	53	else
52	snd_soc_dapm_disable_pin(dapm, "Ext Spk");	54	snd_soc_dapm_disable_pin_unlocked(dapm, "Ext Spk");
53		55
54	/* set up jack connection */	56	/* set up jack connection */
55	switch (spitz_jack_func) {	57	switch (spitz_jack_func) {
56	case SPITZ_HP:	58	case SPITZ_HP:
57	/* enable and unmute hp jack, disable mic bias */	59	/* enable and unmute hp jack, disable mic bias */
58	snd_soc_dapm_disable_pin(dapm, "Headset Jack");	60	snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
59	snd_soc_dapm_disable_pin(dapm, "Mic Jack");	61	snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");
60	snd_soc_dapm_disable_pin(dapm, "Line Jack");	62	snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
61	snd_soc_dapm_enable_pin(dapm, "Headphone Jack");	63	snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack");
62	gpio_set_value(SPITZ_GPIO_MUTE_L, 1);	64	gpio_set_value(SPITZ_GPIO_MUTE_L, 1);
63	gpio_set_value(SPITZ_GPIO_MUTE_R, 1);	65	gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
64	break;	66	break;
65	case SPITZ_MIC:	67	case SPITZ_MIC:
66	/* enable mic jack and bias, mute hp */	68	/* enable mic jack and bias, mute hp */
67	snd_soc_dapm_disable_pin(dapm, "Headphone Jack");	69	snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
68	snd_soc_dapm_disable_pin(dapm, "Headset Jack");	70	snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
69	snd_soc_dapm_disable_pin(dapm, "Line Jack");	71	snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
70	snd_soc_dapm_enable_pin(dapm, "Mic Jack");	72	snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");
71	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);	73	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
72	gpio_set_value(SPITZ_GPIO_MUTE_R, 0);	74	gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
73	break;	75	break;
74	case SPITZ_LINE:	76	case SPITZ_LINE:
75	/* enable line jack, disable mic bias and mute hp */	77	/* enable line jack, disable mic bias and mute hp */
76	snd_soc_dapm_disable_pin(dapm, "Headphone Jack");	78	snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
77	snd_soc_dapm_disable_pin(dapm, "Headset Jack");	79	snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
78	snd_soc_dapm_disable_pin(dapm, "Mic Jack");	80	snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");
79	snd_soc_dapm_enable_pin(dapm, "Line Jack");	81	snd_soc_dapm_enable_pin_unlocked(dapm, "Line Jack");
80	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);	82	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
81	gpio_set_value(SPITZ_GPIO_MUTE_R, 0);	83	gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
82	break;	84	break;
83	case SPITZ_HEADSET:	85	case SPITZ_HEADSET:
84	/* enable and unmute headset jack enable mic bias, mute L hp */	86	/* enable and unmute headset jack enable mic bias, mute L hp */
85	snd_soc_dapm_disable_pin(dapm, "Headphone Jack");	87	snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
86	snd_soc_dapm_enable_pin(dapm, "Mic Jack");	88	snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");
87	snd_soc_dapm_disable_pin(dapm, "Line Jack");	89	snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
88	snd_soc_dapm_enable_pin(dapm, "Headset Jack");	90	snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack");
89	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);	91	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
90	gpio_set_value(SPITZ_GPIO_MUTE_R, 1);	92	gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
91	break;	93	break;
92	case SPITZ_HP_OFF:	94	case SPITZ_HP_OFF:
93		95
94	/* jack removed, everything off */	96	/* jack removed, everything off */
95	snd_soc_dapm_disable_pin(dapm, "Headphone Jack");	97	snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");
96	snd_soc_dapm_disable_pin(dapm, "Headset Jack");	98	snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");
97	snd_soc_dapm_disable_pin(dapm, "Mic Jack");	99	snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");
98	snd_soc_dapm_disable_pin(dapm, "Line Jack");	100	snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");
99	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);	101	gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
100	gpio_set_value(SPITZ_GPIO_MUTE_R, 0);	102	gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
101	break;	103	break;
102	}	104	}
103	snd_soc_dapm_sync(dapm);	105
		106	snd_soc_dapm_sync_unlocked(dapm);
		107
		108	snd_soc_dapm_mutex_unlock(dapm);
104	}	109	}
105		110
106	static int spitz_startup(struct snd_pcm_substream *substream)	111	static int spitz_startup(struct snd_pcm_substream *substream)