Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+1 -1
+1 -1
include/sound/soc.h
··· 1655 1655 /* Helper functions */ 1656 1656 static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm) 1657 1657 { 1658 - mutex_lock(&dapm->card->dapm_mutex); 1658 + mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); 1659 1659 } 1660 1660 1661 1661 static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)