浏览代码

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>
Mike Rapoport 16 年之前
父节点
当前提交
914dc18255
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      sound/soc/soc-core.c

+ 3 - 0
sound/soc/soc-core.c

@@ -954,6 +954,9 @@ 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)
+		return 0;
+
 	run_delayed_work(&card->delayed_work);
 	run_delayed_work(&card->delayed_work);
 
 
 	if (platform->remove)
 	if (platform->remove)