commit 449af266fccdc79300abe9cb533ebcab2c4c736b
author Mark Brown <broonie@kernel.org> Tue Jan 05 23:07:32 2016 +0000
committer Mark Brown <broonie@kernel.org> Tue Jan 05 23:07:32 2016 +0000
tree 24cda8dbd1d00a609069799caaa8402b01e9fb39
parent 7a78d9439ae9515a8ed2b97c267e54da92f2def0
parent 783513eec3209542fcd6ac0cbcb030b3c17a4827

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

include/sound/soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a8b4b9c..fb955e6 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1655,7 +1655,7 @@
 /* Helper functions */
 static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm)
 {
-	mutex_lock(&dapm->card->dapm_mutex);
+	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 }
 
 static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)