OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Guennadi Liakhovetski 2010-03-18 08:23:33 +01:00 committed by Mark Brown
parent fd23b7dee5
commit b2dfa62c52
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/soc-core.c
View File

@ -1283,26 +1283,25 @@ static int soc_remove(struct platform_device *pdev)
struct snd_soc_platform *platform = card->platform;
struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
if (!card->instantiated)
return 0;
if (card->instantiated) {
run_delayed_work(&card->delayed_work);
run_delayed_work(&card->delayed_work);
if (platform->remove)
platform->remove(pdev);
if (platform->remove)
platform->remove(pdev);
if (codec_dev->remove)
codec_dev->remove(pdev);
if (codec_dev->remove)
codec_dev->remove(pdev);
for (i = 0; i < card->num_links; i++) {
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++) {
struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
if (cpu_dai->remove)
cpu_dai->remove(pdev, cpu_dai);
if (card->remove)
card->remove(pdev);
}
if (card->remove)
card->remove(pdev);
snd_soc_unregister_card(card);
return 0;