Commit b2dfa62c authored Mar 18, 2010 by Guennadi Liakhovetski Committed by Mark Brown Mar 19, 2010

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>

parent fd23b7de

sound/soc/soc-core.c

+13 −14

Original line number	Diff line number	Diff line
		@@ -1283,9 +1283,7 @@ 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);

		if (platform->remove)
		@@ -1302,6 +1300,7 @@ static int soc_remove(struct platform_device *pdev)

		if (card->remove)
		card->remove(pdev);
		}

		snd_soc_unregister_card(card);