From: Mark Brown <broonie@kernel.org>
Date: Thu, 6 Jun 2019 21:44:24 +0000 (+0100)
Subject: Merge branch 'asoc-5.2' into asoc-5.3
X-Git-Tag: microblaze-v5.4-rc1~59^2~14^2~242
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=a8e992342ce4cd173d437d0aa4eecc9e30489f72

Merge branch 'asoc-5.2' into asoc-5.3
---

a8e992342ce4cd173d437d0aa4eecc9e30489f72
diff --cc sound/soc/soc-core.c
index f8426c8120b2,3fecd957995e..94a36ee8eb22
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1983,6 -2072,16 +1983,16 @@@ static int snd_soc_instantiate_card(str
  	int ret, i, order;
  
  	mutex_lock(&client_mutex);
+ 	for_each_card_prelinks(card, i, dai_link) {
+ 		ret = soc_init_dai_link(card, dai_link);
+ 		if (ret) {
 -			soc_cleanup_platform(card);
++			soc_cleanup_card_resources(card);
+ 			dev_err(card->dev, "ASoC: failed to init link %s: %d\n",
+ 				dai_link->name, ret);
+ 			mutex_unlock(&client_mutex);
+ 			return ret;
+ 		}
+ 	}
  	mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT);
  
  	card->dapm.bias_level = SND_SOC_BIAS_OFF;