]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: SOF: core: remove snd_soc_unregister_component in case of error
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Fri, 24 May 2019 19:09:18 +0000 (14:09 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 28 May 2019 14:46:58 +0000 (15:46 +0100)
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>
sound/soc/sof/core.c

index 0bc4a8472c105c39efd93e35c9dcf42bea9c9e35..693ad83bffc9c32fba06d487960a3604e0a05632 100644 (file)
@@ -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: