Unverified Commit 284e70ac authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: SOF: Intel: use hdev->info.link_mask directly 



The link_mask variable is not changed after setting to
hdev->info.link_mask until it is used for another purpose to get the
used SoundWire links and set to mach->mach_params.links. Besides, the
link_mask variable should be reset before any link id is added to the
link_mask. To fix the issue above and avoid confusing, use the
hdev->info.link_mask variable directly to check if the SoundWire link
is enabled.

Fixes: 5226d19d ("ASoC: SOF: Intel: use sof_sdw as default SDW machine driver")
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://patch.msgid.link/20260203072405.3716307-1-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 10db9f68

sound/soc/sof/intel/hda.c

+2 −3
Original line number Diff line number Diff line
@@ -1304,9 +1304,8 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev 
	int i;



	hdev = pdata->hw_pdata;

	link_mask = hdev->info.link_mask;



	if (!link_mask) {

	if (!hdev->info.link_mask) {

		dev_info(sdev->dev, "SoundWire links not enabled\n");

		return NULL;

	}
@@ -1337,7 +1336,7 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev 
		 * link_mask supported by hw and then go on searching

		 * link_adr

		 */

		if (~link_mask & mach->link_mask)

		if (~hdev->info.link_mask & mach->link_mask)

			continue;



		/* No need to match adr if there is no links defined */