diff options
| author |   Mark Brown <broonie@kernel.org> | 2018-01-26 15:26:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-26 15:26:35 +0000 |
| commit | 3c4cb8b20a0f93dcb85dcba3ddc9f4e63c1750fc (patch) | |
| tree | 9e4a7cd6afedb5342ee99f334c6e87ef8eddc7c2 | |
| parent | Linux 4.15-rc9 (diff) | |
| parent | ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free() (diff) | |
| download | linux-dev-3c4cb8b20a0f93dcb85dcba3ddc9f4e63c1750fc.tar.xz linux-dev-3c4cb8b20a0f93dcb85dcba3ddc9f4e63c1750fc.zip | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
| -rw-r--r-- | sound/soc/soc-pcm.c | 5 |
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) |