The pin updates in this driver look like they are intended to be done atomically, update to do so.
Signed-off-by: Charles Keepax <[email protected]> --- sound/soc/codecs/wm8962.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index c06bb50..535a7dc 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3126,14 +3126,18 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) snd_soc_jack_report(wm8962->jack, 0, SND_JACK_MICROPHONE | SND_JACK_BTN_0); + mutex_lock(&codec->dapm.card->dapm_mutex); + if (jack) { - snd_soc_dapm_force_enable_pin(&codec->dapm, "SYSCLK"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "MICBIAS"); + snd_soc_dapm_force_enable_pin_locked(&codec->dapm, "SYSCLK"); + snd_soc_dapm_force_enable_pin_locked(&codec->dapm, "MICBIAS"); } else { - snd_soc_dapm_disable_pin(&codec->dapm, "SYSCLK"); - snd_soc_dapm_disable_pin(&codec->dapm, "MICBIAS"); + snd_soc_dapm_disable_pin_locked(&codec->dapm, "SYSCLK"); + snd_soc_dapm_disable_pin_locked(&codec->dapm, "MICBIAS"); } + mutex_unlock(&codec->dapm.card->dapm_mutex); + return 0; } EXPORT_SYMBOL_GPL(wm8962_mic_detect); -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
