Commit 914dc182 authored May 11, 2009 by Mike Rapoport Committed by Mark Brown May 11, 2009

ASoC: soc-core: fix crash when removing not instantiated card



If the card was not instantiated in snd_soc_instantiate_card, calling
soc-remove will crash because some of codec, cpu_dai and card .remove
methods are called twice.
Fix this by returning from soc_remove immediately.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 97a775c4

sound/soc/soc-core.c

+3 −0

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

		run_delayed_work(&card->delayed_work);

		if (platform->remove)

Admin message