|
@@ -3247,9 +3247,6 @@ static void wm8958_default_micdet(u16 status, void *data)
|
|
|
|
|
|
wm8958_micd_set_rate(codec);
|
|
|
|
|
|
- snd_soc_jack_report(wm8994->micdet[0].jack, SND_JACK_HEADPHONE,
|
|
|
- SND_JACK_HEADSET);
|
|
|
-
|
|
|
/* If we have jackdet that will detect removal */
|
|
|
if (wm8994->jackdet) {
|
|
|
mutex_lock(&wm8994->accdet_lock);
|
|
@@ -3262,14 +3259,13 @@ static void wm8958_default_micdet(u16 status, void *data)
|
|
|
|
|
|
mutex_unlock(&wm8994->accdet_lock);
|
|
|
|
|
|
- if (wm8994->pdata->jd_ext_cap) {
|
|
|
- mutex_lock(&codec->mutex);
|
|
|
+ if (wm8994->pdata->jd_ext_cap)
|
|
|
snd_soc_dapm_disable_pin(&codec->dapm,
|
|
|
"MICBIAS2");
|
|
|
- snd_soc_dapm_sync(&codec->dapm);
|
|
|
- mutex_unlock(&codec->mutex);
|
|
|
- }
|
|
|
}
|
|
|
+
|
|
|
+ snd_soc_jack_report(wm8994->micdet[0].jack, SND_JACK_HEADPHONE,
|
|
|
+ SND_JACK_HEADSET);
|
|
|
}
|
|
|
|
|
|
/* Report short circuit as a button */
|
|
@@ -3358,16 +3354,11 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
|
|
|
|
|
|
/* If required for an external cap force MICBIAS on */
|
|
|
if (wm8994->pdata->jd_ext_cap) {
|
|
|
- mutex_lock(&codec->mutex);
|
|
|
-
|
|
|
if (present)
|
|
|
snd_soc_dapm_force_enable_pin(&codec->dapm,
|
|
|
"MICBIAS2");
|
|
|
else
|
|
|
snd_soc_dapm_disable_pin(&codec->dapm, "MICBIAS2");
|
|
|
-
|
|
|
- snd_soc_dapm_sync(&codec->dapm);
|
|
|
- mutex_unlock(&codec->mutex);
|
|
|
}
|
|
|
|
|
|
if (present)
|