ASoC: Merge up fixes for CI

broonie · broonie · commit 1afc383a1700 · 2023-06-21T01:32:48.000+01:00
Some of the fixes merged should be relevant for my CI stability.
diff --git 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;
 				}

Original file line number	Diff line number	Diff line change
`@@ -1687,7 +1687,7 @@ static int sof_card_dai_links_create(struct device *dev,`
`1687`	`1687`	`if ((SDW_PART_ID(adr_link->adr_d[i].adr) !=`
`1688`	`1688`	`SDW_PART_ID(adr_link->adr_d[j].adr)) \|\|`
`1689`	`1689`	`(SDW_MFG_ID(adr_link->adr_d[i].adr) !=`
`1690`		`- SDW_MFG_ID(adr_link->adr_d[i].adr))) {`
	`1690`	`+ SDW_MFG_ID(adr_link->adr_d[j].adr))) {`
`1691`	`1691`	`append_dai_type = true;`
`1692`	`1692`	`goto out;`
`1693`	`1693`	`}`