Skip to content

Commit 4e6ca75

Browse files
committed
fixup! ASoC: SOF: Intel: hda: override mclk_id after parsing NHLT SSP blob
Changed error handling, two-mclk configuration is added in the intel-nhlt library and we only need to detect a negative value. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent d0ab1be commit 4e6ca75

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

sound/soc/sof/intel/hda.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1594,9 +1594,14 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)
15941594

15951595
mclk_mask = check_nhlt_ssp_mclk_mask(sdev, ssp_num);
15961596

1597+
if (mclk_mask < 0) {
1598+
dev_err(sdev->dev, "Invalid MCLK configuration\n");
1599+
return NULL;
1600+
}
1601+
15971602
dev_dbg(sdev->dev, "MCLK mask %#x found in NHLT\n", mclk_mask);
15981603

1599-
if (mclk_mask && mclk_mask != GENMASK(1, 0)) {
1604+
if (mclk_mask) {
16001605
dev_info(sdev->dev, "Overriding topology with MCLK mask %#x from NHLT\n", mclk_mask);
16011606
sdev->mclk_id_override = true;
16021607
sdev->mclk_id_quirk = (mclk_mask & BIT(0)) ? 0 : 1;

0 commit comments

Comments
 (0)