OSDN Git Service

ASoC: soc-core: snd_soc_unbind_card() cleanup
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 15 Oct 2019 03:59:51 +0000 (12:59 +0900)
committerMark Brown <broonie@kernel.org>
Tue, 22 Oct 2019 18:13:09 +0000 (19:13 +0100)
soc_remove_link_components() will be called from
soc_cleanup_card_resources(). This patch removes duplicate call.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e5664lz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index bd2ac19..f028a69 100644 (file)
@@ -2446,9 +2446,6 @@ static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)
                snd_soc_dapm_shutdown(card);
                snd_soc_flush_all_delayed_work(card);
 
-               /* remove all components used by DAI links on this card */
-               soc_remove_link_components(card);
-
                soc_cleanup_card_resources(card);
                if (!unregister)
                        list_add(&card->list, &unbind_card_list);