summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-01-06 22:58:13 +0300
committerTakashi Iwai <tiwai@suse.de>2016-01-06 23:14:35 +0300
commit9d9938854efcf2f21381b930bc1324e95640e0c4 (patch)
tree7b136c25af5fcc64258f3427f985c1dc667ae0bd /include/sound
parentca9ea7a5ffda53ce9e9f3e14b9b104d85db47c7d (diff)
parent3f37b26f8d57756b591383a9d8ce1cd628bc773c (diff)
downloadlinux-9d9938854efcf2f21381b930bc1324e95640e0c4.tar.xz
Merge branch 'for-linus' into for-next
Conflicts: drivers/gpu/drm/i915/intel_display.c sound/soc/intel/skylake/skl.h
Diffstat (limited to 'include/sound')
-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 a2deeb954c21..aae55d00feb8 100644
--- 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)