summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-26 15:26:35 +0000
committerMark Brown <broonie@kernel.org>2018-01-26 15:26:35 +0000
commit3c4cb8b20a0f93dcb85dcba3ddc9f4e63c1750fc (patch)
tree9e4a7cd6afedb5342ee99f334c6e87ef8eddc7c2
parent0c5b9b5d9adbad4b60491f9ba0d2af38904bb4b9 (diff)
parentf30a4c313eb6d5027a85869d1ccf626208218ed0 (diff)
downloadlinux-3c4cb8b20a0f93dcb85dcba3ddc9f4e63c1750fc.tar.gz
linux-3c4cb8b20a0f93dcb85dcba3ddc9f4e63c1750fc.zip
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
-rw-r--r--sound/soc/soc-pcm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8075856668c2..998800cc44ef 100644
--- 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)