Unverified Commit 1afc383a authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes for CI 

Some of the fixes merged should be relevant for my CI stability.
parents 9bd1f9db 1f1ef7e5

sound/soc/intel/boards/sof_sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

				}