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

3c4cb8b2 · Mark Brown · 0c5b9b5d · f30a4c31 · 3c4cb8b2
Commit 3c4cb8b2 authored Jan 26, 2018 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sound/soc/soc-pcm.c sound/soc/soc-pcm.c +2 -3

No files found.
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2831,10 +2831,9 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
 	struct snd_soc_rtdcom_list *rtdcom;
 	struct snd_soc_component *component;

+	/* need to sync the delayed work before releasing resources */
+	flush_delayed_work(&rtd->delayed_work);
 	for_each_rtdcom(rtd, rtdcom) {
-		/* need to sync the delayed work before releasing resources */
-
-		flush_delayed_work(&rtd->delayed_work);
 		component = rtdcom->component;

 		if (component->pcm_free)