diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-18 15:50:42 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-18 15:50:42 +0300 |
| commit | b8f3b564937c1f3529bc4897cc41c5d95d2cdbe9 (patch) | |
| tree | b71ed4906bbe2ca96d68dbf1d6d6f0fe2676f1de /sound/soc/sof/core.c | |
| parent | 4e52cb9e2c22c9d860910794c82461064baadd9f (diff) | |
| parent | 519d81956ee277b4419c723adfb154603c2565ba (diff) | |
| download | linux-b8f3b564937c1f3529bc4897cc41c5d95d2cdbe9.tar.xz | |
Merge tag 'v5.15-rc6' into asoc-5.16
Linux 5.15-rc6
Diffstat (limited to 'sound/soc/sof/core.c')
| -rw-r--r-- | sound/soc/sof/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index b5ffcd438c1c..2c3de295f11f 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -368,7 +368,6 @@ int snd_sof_device_remove(struct device *dev) dev_warn(dev, "error: %d failed to prepare DSP for device removal", ret); - snd_sof_fw_unload(sdev); snd_sof_ipc_free(sdev); snd_sof_free_debug(sdev); snd_sof_free_trace(sdev); @@ -391,8 +390,7 @@ int snd_sof_device_remove(struct device *dev) snd_sof_remove(sdev); /* release firmware */ - release_firmware(pdata->fw); - pdata->fw = NULL; + snd_sof_fw_unload(sdev); return 0; } |