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

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

parents 7a78d943 783513ee
...@@ -1655,7 +1655,7 @@ extern const struct dev_pm_ops snd_soc_pm_ops; ...@@ -1655,7 +1655,7 @@ extern const struct dev_pm_ops snd_soc_pm_ops;
/* Helper functions */ /* Helper functions */
static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm) 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) static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment