diff options
| author | Curtis Malainey <cujomalainey@chromium.org> | 2019-11-27 17:13:58 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-12-09 10:55:42 +0000 |
| commit | 9c9b65203492927cc4ae419e9601e837ecbd889e (patch) | |
| tree | 7ca8a2263d94a0e034d6b94b8b01b270a6920c62 /sound | |
| parent | 7eccc05c7101f34cc36afe9405d15de6d4099fb4 (diff) | |
| download | linux-9c9b65203492927cc4ae419e9601e837ecbd889e.tar.bz2 | |
ASoC: core: only flush inited work during free
There are many paths to soc_free_pcm_runtime which can both have and
have not yet inited the workqueue yet. When we flush the queue when we
have not yet inited the queue we cause warnings to be printed.
An example is soc_cleanup_card_resources which is called by
snd_soc_bind_card which has multiple failure points before and after
soc_link_init -> soc_new_pcm which is where the queue is inited.
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Link: https://lore.kernel.org/r/20191128011358.39234-1-cujomalainey@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0e2e628302f1..1c84ff1a5bf9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -419,7 +419,8 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd) list_del(&rtd->list); - flush_delayed_work(&rtd->delayed_work); + if (delayed_work_pending(&rtd->delayed_work)) + flush_delayed_work(&rtd->delayed_work); snd_soc_pcm_component_free(rtd); /* |