diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-05 18:07:32 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-05 18:07:32 -0500 |
| commit | 449af266fccdc79300abe9cb533ebcab2c4c736b (patch) | |
| tree | 24cda8dbd1d00a609069799caaa8402b01e9fb39 /include/sound | |
| parent | 7a78d9439ae9515a8ed2b97c267e54da92f2def0 (diff) | |
| parent | 783513eec3209542fcd6ac0cbcb030b3c17a4827 (diff) | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 2 |
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; | |||
| 1655 | /* Helper functions */ | 1655 | /* Helper functions */ |
| 1656 | static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm) | 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 | static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm) | 1661 | static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm) |