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

449af266 · Mark Brown · 7a78d943 · 783513ee · 449af266
Commit 449af266 authored Jan 05, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/sound/soc.h include/sound/soc.h +1 -1

No files found.
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1655,7 +1655,7 @@ extern const struct dev_pm_ops snd_soc_pm_ops;
 /* 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)