diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-04 11:53:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-04 11:53:49 +0000 |
| commit | ff1b1c3fef511ff051db0d5de332afd15acad363 (patch) | |
| tree | e5bbb9597074eafaf665b4daa41fe6a340783636 /sound/soc/soc-core.c | |
| parent | 2a374b78f5c2b5f31d35f8a7cd004989d6936756 (diff) | |
| parent | 92a99ea439c4e27fc6e32eb6d51c5d091c6084bd (diff) | |
Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e20bb65a1634..ea1df2083bd5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -624,8 +624,8 @@ int snd_soc_suspend(struct device *dev) SND_SOC_DAPM_STREAM_SUSPEND); } - /* Recheck all analogue paths too */ - dapm_mark_io_dirty(&card->dapm); + /* Recheck all endpoints too, their state is affected by suspend */ + dapm_mark_endpoints_dirty(card); snd_soc_dapm_sync(&card->dapm); /* suspend all CODECs */ @@ -786,8 +786,8 @@ static void soc_resume_deferred(struct work_struct *work) /* userspace can access us now we are back as we were before */ snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D0); - /* Recheck all analogue paths too */ - dapm_mark_io_dirty(&card->dapm); + /* Recheck all endpoints too, their state is affected by suspend */ + dapm_mark_endpoints_dirty(card); snd_soc_dapm_sync(&card->dapm); } |