Unverified Commit 53fe24c2 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: sof-audio: preserve topology filename override in nocodec mode 



If the topology filename is modified at a higher level, be it with a
DMI quirk or a kernel module parameter, we don't want to use the
default 'nocodec' topology name extracted from descriptors.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220414184817.362215-8-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/sof-audio.c

+2 −1
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ int sof_machine_check(struct snd_sof_dev *sdev) 
		return -ENOMEM;



	mach->drv_name = "sof-nocodec";

	if (!sof_pdata->tplg_filename)

		sof_pdata->tplg_filename = desc->nocodec_tplg_filename;



	sof_pdata->machine = mach;