Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core

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);
 }