If soc_probe_link_dais() finds a codec-codec link it skips creating a compress or pcm stream and links the DAIs together. But it must also init the delayed_work otherwise shutting down the DAI chain will fault when calling flush_delayed_work_sync() on the linked DAI.
Pointing it to a dummy work callback is cleaner than taking special cases in the code to bypass the flush_delayed_work_sync().
Signed-off-by: Richard Fitzgerald rf@opensource.wolfsonmicro.com --- sound/soc/soc-core.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4489c5b..bbe136c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -199,6 +199,10 @@ static ssize_t pmdown_time_set(struct device *dev, return count; }
+static void dummy_delayed_work(struct work_struct *work) +{ +} + static DEVICE_ATTR(pmdown_time, 0644, pmdown_time_show, pmdown_time_set);
#ifdef CONFIG_DEBUG_FS @@ -1428,6 +1432,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) return ret; } } else { + INIT_DELAYED_WORK(&rtd->delayed_work, dummy_delayed_work); + /* link the DAI widgets */ play_w = codec_dai->playback_widget; capture_w = cpu_dai->capture_widget;