From 5a4c9f054ceeaa90caef033f5a52eca2d7975364 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 15 Oct 2019 12:59:51 +0900
Subject: [PATCH] ASoC: soc-core: snd_soc_unbind_card() cleanup
Git-commit: 5a4c9f054ceeaa90caef033f5a52eca2d7975364
Patch-mainline: v5.5-rc1
References: jsc#SLE-16518
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>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/soc-core.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bd2ac1912466..f028a6938ee8 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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);
--
2.16.4