diff options
| author |  Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
| 2024-04-17 10:58:04 +0300 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2024-04-17 23:01:01 +0900 |
| commit | 9a039db9273b44427b3daca88173e57596545ec0 (patch) | |
| tree | 65dad1184a598fdf88867fd3afcce7b395d6e3aa /sound | |
| parent | ASoC: rt715: add vendor clear control register (diff) | |
| download | linux-9a039db9273b44427b3daca88173e57596545ec0.tar.gz linux-9a039db9273b44427b3daca88173e57596545ec0.tar.bz2 linux-9a039db9273b44427b3daca88173e57596545ec0.zip | |
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: 90f8917e7a15 ("ASoC: SOF: Core: Add remove_late() to sof_init_environment failure path")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-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: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sof/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index cc84d4c81be9..238bda5f6b76 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -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); |