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/wm5100.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 4e3e31a..c69992b 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2117,8 +2117,13 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) WM5100_ACCDET_RATE_MASK); /* We need the charge pump to power MICBIAS */ - snd_soc_dapm_force_enable_pin(&codec->dapm, "CP2"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "SYSCLK"); + mutex_lock(&codec->dapm.card->dapm_mutex); + + snd_soc_dapm_force_enable_pin_locked(&codec->dapm, "CP2"); + snd_soc_dapm_force_enable_pin_locked(&codec->dapm, "SYSCLK"); + + mutex_unlock(&codec->dapm.card->dapm_mutex); + snd_soc_dapm_sync(&codec->dapm); /* We start off just enabling microphone detection - even a -- 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/
