Commit b2dfa62c authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mark Brown

ASoC: remove a card from the list, if instantiation failed

If instantiation of a card failed, we still have to remove it from the
card list on unregistration. This fixes an Oops on Migo-R, triggering,
when after a failed firmware load attempt the driver modules are removed
and re-inserted again.
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fd23b7de
...@@ -1283,26 +1283,25 @@ static int soc_remove(struct platform_device *pdev) ...@@ -1283,26 +1283,25 @@ static int soc_remove(struct platform_device *pdev)
struct snd_soc_platform *platform = card->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_codec_device *codec_dev = socdev->codec_dev; struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
if (!card->instantiated) if (card->instantiated) {
return 0; run_delayed_work(&card->delayed_work);
run_delayed_work(&card->delayed_work); if (platform->remove)
platform->remove(pdev);
if (platform->remove) if (codec_dev->remove)
platform->remove(pdev); codec_dev->remove(pdev);
if (codec_dev->remove) for (i = 0; i < card->num_links; i++) {
codec_dev->remove(pdev); struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
if (cpu_dai->remove)
cpu_dai->remove(pdev, cpu_dai);
}
for (i = 0; i < card->num_links; i++) { if (card->remove)
struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; card->remove(pdev);
if (cpu_dai->remove)
cpu_dai->remove(pdev, cpu_dai);
} }
if (card->remove)
card->remove(pdev);
snd_soc_unregister_card(card); snd_soc_unregister_card(card);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment