diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-12-10 13:27:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-12-10 13:27:14 +0000 |
| commit | 2acf6ce2c25fb71a56ad35fcb9a63c19b20a4f4e (patch) | |
| tree | c1df2943269ea35c97d07eb392008d38430835b4 /sound/soc/soc-core.c | |
| parent | ASoC: SOF: Intel: byt: fixup topology filename for BYT-CR (diff) | |
| parent | ASoC: Intel: common: work-around incorrect ACPI HID for CML boards (diff) | |
| download | linux-dev-2acf6ce2c25fb71a56ad35fcb9a63c19b20a4f4e.tar.xz linux-dev-2acf6ce2c25fb71a56ad35fcb9a63c19b20a4f4e.zip | |
Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.6
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f662d677229b..750469acd5b4 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); /* @@ -435,6 +436,15 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd) device_unregister(rtd->dev); } +static void close_delayed_work(struct work_struct *work) { + struct snd_soc_pcm_runtime *rtd = + container_of(work, struct snd_soc_pcm_runtime, + delayed_work.work); + + if (rtd->close_delayed_work_func) + rtd->close_delayed_work_func(rtd); +} + static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { @@ -470,6 +480,7 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( rtd->dev = dev; dev_set_drvdata(dev, rtd); + INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); /* * for rtd->codec_dais |