Merge tag 'asoc-v4.5' into asoc-next

[linux-beck.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a2deeb954c215eacf75ab20831173871cdbd0b3b..aae55d00feb8856c7c6511c580ae356242e45162 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1687,7 +1687,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)