diff options
| author | Peter Ujfalusi <peter.ujfalusi@linux.intel.com> | 2021-11-02 12:47:56 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-11-15 22:25:27 +0300 |
| commit | 5b59289bfdbe287d0756e5ccadf039329147de67 (patch) | |
| tree | 8de0799c9468c5d2219c61ec9a418b1ded83c3af /sound/soc/sof/core.c | |
| parent | 5dbec393cd23ecfdeddced217f8a1c11228139c4 (diff) | |
| download | linux-5b59289bfdbe287d0756e5ccadf039329147de67.tar.xz | |
ASoC: SOF: core: Unregister machine driver before IPC and debugfs
To ensure clean unload of the machine driver, components and topology, do
the unregister before we free IPC and debugfs.
It is a possibility that part of the unregister we would have IPC
communication with the firmware.
Suggested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20211102094756.9317-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/core.c')
| -rw-r--r-- | sound/soc/sof/core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 9ec9ef8ed525..40549cdd6d58 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -362,6 +362,13 @@ int snd_sof_device_remove(struct device *dev) if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) cancel_work_sync(&sdev->probe_work); + /* + * Unregister machine driver. This will unbind the snd_card which + * will remove the component driver and unload the topology + * before freeing the snd_card. + */ + snd_sof_machine_unregister(sdev, pdata); + if (sdev->fw_state > SOF_FW_BOOT_NOT_STARTED) { snd_sof_free_trace(sdev); ret = snd_sof_dsp_power_down_notify(sdev); @@ -374,13 +381,6 @@ int snd_sof_device_remove(struct device *dev) } /* - * Unregister machine driver. This will unbind the snd_card which - * will remove the component driver and unload the topology - * before freeing the snd_card. - */ - snd_sof_machine_unregister(sdev, pdata); - - /* * Unregistering the machine driver results in unloading the topology. * Some widgets, ex: scheduler, attempt to power down the core they are * scheduled on, when they are unloaded. Therefore, the DSP must be |