Unverified Commit 9a039db9 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Core: Handle error returned by sof_select_ipc_and_paths 



The patch which fixed the missing remove_late() calls missed a case
when sof_select_ipc_and_paths() could return with error and in this
case sof_init_environment() would just return with 0.

Do not ignore the error code returned by sof_select_ipc_and_paths().

Fixes: 90f8917e ("ASoC: SOF: Core: Add remove_late() to sof_init_environment failure path")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240417075804.10829-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/core.c

+3 −1
Original line number Diff line number Diff line
@@ -350,7 +350,9 @@ static int sof_init_environment(struct snd_sof_dev *sdev) 
	}



	ret = sof_select_ipc_and_paths(sdev);

	if (!ret && plat_data->ipc_type != base_profile->ipc_type) {

	if (ret) {

		goto err_machine_check;

	} else if (plat_data->ipc_type != base_profile->ipc_type) {

		/* IPC type changed, re-initialize the ops */

		sof_ops_free(sdev);