ASoC: Merge up fixes for CI

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

ASoC: Merge up fixes for CI
Some of the fixes merged should be relevant for my CI stability.
1afc383a · Mark Brown · 9bd1f9db · 1f1ef7e5 · 1afc383a
Commit 1afc383a authored Jun 21, 2023 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/intel/boards/sof_sdw.c sound/soc/intel/boards/sof_sdw.c +1 -1

No files found.
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -1687,7 +1687,7 @@ static int sof_card_dai_links_create(struct device *dev,
 				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_dai_type = true;
 					goto out;
 				}