Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 449af266 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 7a78d943 783513ee

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -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)