From: Mark Brown <broonie@kernel.org>
Date: Wed, 21 Jun 2023 00:32:31 +0000 (+0100)
Subject: ASoC: Merge up fixes for CI
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1afc383a17001b93fd1e5c749b0f6a668412b85b;p=linux.git

ASoC: Merge up fixes for CI

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

1afc383a17001b93fd1e5c749b0f6a668412b85b
diff --cc sound/soc/intel/boards/sof_sdw.c
index f2f56150e1da3,144f082c63fda..dbee8c98ff012
--- a/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;
  				}
  			}