Merge tag 'asoc-fix-v6.4-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

tiwai · tiwai · commit 6f9441f4e3eb · 2023-06-21T15:23:23.000+02:00
ASoC: Fix for v6.4

A fix for a typoed iterator in the Intel Soundwire driver, fairly simple
on inspection though not reviewed by Intel.
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
@@ -1347,7 +1347,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_codec_type = true;
 					goto out;
 				}

Original file line number	Diff line number	Diff line change
`@@ -1347,7 +1347,7 @@ static int sof_card_dai_links_create(struct device *dev,`
`1347`	`1347`	`if ((SDW_PART_ID(adr_link->adr_d[i].adr) !=`
`1348`	`1348`	`SDW_PART_ID(adr_link->adr_d[j].adr)) \|\|`
`1349`	`1349`	`(SDW_MFG_ID(adr_link->adr_d[i].adr) !=`
`1350`		`- SDW_MFG_ID(adr_link->adr_d[i].adr))) {`
	`1350`	`+ SDW_MFG_ID(adr_link->adr_d[j].adr))) {`
`1351`	`1351`	`append_codec_type = true;`
`1352`	`1352`	`goto out;`
`1353`	`1353`	`}`