diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:58 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:58 +0000 |
commit | 53a2c4db8cf229047de88b3f1bd41d5a5d2756eb (patch) | |
tree | 46ab33e4c837e0b893ddf8fb3817dd3f6042eb32 /sound/soc/codecs/wm5100.c | |
parent | da8ab21cfea80655a0f7bbbc3f2fa0975970b8cb (diff) | |
parent | f9fa2b1855a9ece2ec2a4f54b7f9131cd89257d6 (diff) | |
download | linux-stable-53a2c4db8cf229047de88b3f1bd41d5a5d2756eb.tar.gz linux-stable-53a2c4db8cf229047de88b3f1bd41d5a5d2756eb.tar.bz2 linux-stable-53a2c4db8cf229047de88b3f1bd41d5a5d2756eb.zip |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm5100.c')
-rw-r--r-- | sound/soc/codecs/wm5100.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 4e3e31aaf509..492fe846ae68 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2100,6 +2100,7 @@ static void wm5100_micd_irq(struct wm5100_priv *wm5100) int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) { struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_dapm_context *dapm = &codec->dapm; if (jack) { wm5100->jack = jack; @@ -2117,9 +2118,14 @@ 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"); - snd_soc_dapm_sync(&codec->dapm); + snd_soc_dapm_mutex_lock(dapm); + + snd_soc_dapm_force_enable_pin_unlocked(dapm, "CP2"); + snd_soc_dapm_force_enable_pin_unlocked(dapm, "SYSCLK"); + + snd_soc_dapm_sync_unlocked(dapm); + + snd_soc_dapm_mutex_unlock(dapm); /* We start off just enabling microphone detection - even a * plain headphone will trigger detection. |