diff options
author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2019-05-24 14:09:18 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-05-28 15:46:58 +0100 |
commit | 13931ae31b67a8a26a4cd417088fc43e3d4a8591 (patch) | |
tree | 833e06ccd9fad976e71911628aa6e9629d177d2c /sound/soc/sof/core.c | |
parent | b85459aafae63f250606bd406d4f7537fda33b51 (diff) | |
download | linux-stable-13931ae31b67a8a26a4cd417088fc43e3d4a8591.tar.gz linux-stable-13931ae31b67a8a26a4cd417088fc43e3d4a8591.tar.bz2 linux-stable-13931ae31b67a8a26a4cd417088fc43e3d4a8591.zip |
ASoC: SOF: core: remove snd_soc_unregister_component in case of error
No need to call snd_soc_unregister_component in case of error
because the component device is resource-managed.
Fixes: c16211d6226 ("ASoC: SOF: Add Sound Open Firmware driver core")
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 0bc4a8472c10..693ad83bffc9 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -382,7 +382,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) if (IS_ERR(plat_data->pdev_mach)) { ret = PTR_ERR(plat_data->pdev_mach); - goto comp_err; + goto fw_run_err; } dev_dbg(sdev->dev, "created machine %s\n", @@ -393,8 +393,6 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) return 0; -comp_err: - snd_soc_unregister_component(sdev->dev); fw_run_err: snd_sof_fw_unload(sdev); fw_load_err: |