Unverified Commit 3d59eaef authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: topology: No need to assign core ID if token parsing failed 



Move the return value check before attempting to assign the core ID to the
swidget since we are going to fail the sof_widget_ready() and free up
swidget anyways.

Fixes: 909dadf2 ("ASoC: SOF: topology: Make DAI widget parsing IPC agnostic")

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221107090433.5146-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/topology.c

+10 −10
Original line number Diff line number Diff line
@@ -1344,16 +1344,6 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
		break;

	}



	if (sof_debug_check_flag(SOF_DBG_DISABLE_MULTICORE)) {

		swidget->core = SOF_DSP_PRIMARY_CORE;

	} else {

		int core = sof_get_token_value(SOF_TKN_COMP_CORE_ID, swidget->tuples,

					       swidget->num_tuples);



		if (core >= 0)

			swidget->core = core;

	}



	/* check token parsing reply */

	if (ret < 0) {

		dev_err(scomp->dev,
@@ -1365,6 +1355,16 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
		return ret;

	}



	if (sof_debug_check_flag(SOF_DBG_DISABLE_MULTICORE)) {

		swidget->core = SOF_DSP_PRIMARY_CORE;

	} else {

		int core = sof_get_token_value(SOF_TKN_COMP_CORE_ID, swidget->tuples,

					       swidget->num_tuples);



		if (core >= 0)

			swidget->core = core;

	}



	/* bind widget to external event */

	if (tw->event_type) {

		if (widget_ops[w->id].bind_event) {