ASoC: Merge up fixes for CI

Some of the fixes merged should be relevant for my CI stability.

diff --cc sound/soc/intel/boards/sof_sdw.c
index f2f56150e1da3435c5c11770e831b49fa00e02f1,144f082c63fdaa01cba6e364a883992c8bd13951..dbee8c98ff0122b1a5cfec54e6cf4a4683766cc7
--- 1/sound/soc/intel/boards/sof_sdw.c
--- 2/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@@ -1687,8 -1347,8 +1687,8 @@@ static int sof_card_dai_links_create(st
                                if ((SDW_PART_ID(adr_link->adr_d[i].adr) !=
                                    SDW_PART_ID(adr_link->adr_d[j].adr)) ||
                                    (SDW_MFG_ID(adr_link->adr_d[i].adr) !=
-                                   SDW_MFG_ID(adr_link->adr_d[i].adr))) {
+                                   SDW_MFG_ID(adr_link->adr_d[j].adr))) {
 -                                      append_codec_type = true;
 +                                      append_dai_type = true;
                                        goto out;
                                }
                        }