summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-05 23:07:32 +0000
committerMark Brown <broonie@kernel.org>2016-01-05 23:07:32 +0000
commit449af266fccdc79300abe9cb533ebcab2c4c736b (patch)
tree24cda8dbd1d00a609069799caaa8402b01e9fb39 /include
parent7a78d9439ae9515a8ed2b97c267e54da92f2def0 (diff)
parent783513eec3209542fcd6ac0cbcb030b3c17a4827 (diff)
downloadlinux-449af266fccdc79300abe9cb533ebcab2c4c736b.tar.gz
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index a8b4b9c8b1d2..fb955e69a78e 100644
--- 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)