korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: SOF: core: free trace on errors

Browse Source 
free_trace() is not called on probe errors, fix

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200124213625.30186-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
This commit is contained in:
Pierre-Louis Bossart 2020-01-24 15:36:20 -06:00 committed by Mark Brown
parent 4f7f9564a8
commit 37e97e6fae
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/sof/core.c
View File

@ -224,12 +224,12 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
if (ret < 0) { if (ret < 0) {
dev_err(sdev->dev, dev_err(sdev->dev,
"error: failed to register DSP DAI driver %d\n", ret); "error: failed to register DSP DAI driver %d\n", ret);
goto fw_run_err; goto fw_trace_err;
} }
ret = snd_sof_machine_register(sdev, plat_data); ret = snd_sof_machine_register(sdev, plat_data);
if (ret < 0) if (ret < 0)
goto fw_run_err; goto fw_trace_err;
/* /*
* Some platforms in SOF, ex: BYT, may not have their platform PM * Some platforms in SOF, ex: BYT, may not have their platform PM
@ -245,6 +245,8 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
return 0; return 0;
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) #if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)
fw_trace_err:
snd_sof_free_trace(sdev);
fw_run_err: fw_run_err:
snd_sof_fw_unload(sdev); snd_sof_fw_unload(sdev);
fw_load_err: fw_load_err:
@ -262,6 +264,7 @@ dbg_err:
* snd_sof_device_remove() when the PCI/ACPI device is removed * snd_sof_device_remove() when the PCI/ACPI device is removed
*/ */
fw_trace_err:
fw_run_err: fw_run_err:
fw_load_err: fw_load_err:
ipc_err: ipc_err: