Merge branch 'asoc-5.2' into asoc-5.3

diff --cc sound/hda/ext/hdac_ext_bus.c
Simple merge

diff --cc sound/soc/intel/boards/bytcht_es8316.c
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_max98090_ti.c
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_nau8824.c
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_rt5672.c
Simple merge

diff --cc sound/soc/soc-core.c
index f8426c8120b2b1301029a55f4cd250381cfe209a,3fecd957995e0deea5c3d71431e89fa207ad70e0..94a36ee8eb224606be62e248f105fbaa18f965bd
--- 1/sound/soc/soc-core.c
--- 2/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);
 -                      soc_cleanup_platform(card);
+       for_each_card_prelinks(card, i, dai_link) {
+               ret = soc_init_dai_link(card, dai_link);
+               if (ret) {
++                      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;

diff --cc sound/soc/sof/intel/hda.c
Simple merge

diff --cc sound/soc/sunxi/sun4i-i2s.c
Simple merge