Skip to content

Commit 9968aad

Browse files
morimotobroonie
authored andcommitted
ASoC: soc-core: remove duplicate snd_soc_flush_all_delayed_work()
snd_soc_unbind_card() calls snd_soc_flush_all_delayed_work() (A), but it will be called in soc_cleanup_card_resources() (B). It is duplicated, let's remove it. (B) static void soc_cleanup_card_resources(...) { ... /* flush delayed work before removing DAIs and DAPM widgets */ (A)' snd_soc_flush_all_delayed_work(card); ... } static void snd_soc_unbind_card(...) { if (snd_soc_card_is_instantiated(card)) { card->instantiated = false; (A) snd_soc_flush_all_delayed_work(card); (B) soc_cleanup_card_resources(card); } } Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/87h5pwdc3z.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent a8006eb commit 9968aad

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

sound/soc/soc-core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,8 +2153,6 @@ static void snd_soc_unbind_card(struct snd_soc_card *card)
21532153
{
21542154
if (snd_soc_card_is_instantiated(card)) {
21552155
card->instantiated = false;
2156-
snd_soc_flush_all_delayed_work(card);
2157-
21582156
soc_cleanup_card_resources(card);
21592157
}
21602158
}

0 commit comments

Comments
 (0)