From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH v3 2/9] ASoC: SOF: core: remove snd_soc_unregister_component in case of error
Date: Fri, 24 May 2019 14:09:18 -0500 [thread overview]
Message-ID: <20190524190925.5931-3-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190524190925.5931-1-pierre-louis.bossart@linux.intel.com>
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
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>
---
sound/soc/sof/core.c | 4 +---
1 file changed, 1 insertion(+), 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:
--
2.20.1
next prev parent reply other threads:[~2019-05-24 19:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-24 19:09 [PATCH v3 0/9] ASoC: SOF: stability fixes Pierre-Louis Bossart
2019-05-24 19:09 ` [PATCH v3 1/9] ASoC: SOF: core: remove DSP after unregistering machine driver Pierre-Louis Bossart
2019-05-28 15:07 ` Applied "ASoC: SOF: core: remove DSP after unregistering machine driver" to the asoc tree Mark Brown
2019-05-24 19:09 ` Pierre-Louis Bossart [this message]
2019-05-28 15:07 ` Applied "ASoC: SOF: core: remove snd_soc_unregister_component in case of error" " Mark Brown
2019-05-24 19:09 ` [PATCH v3 3/9] ASoC: SOF: core: fix error handling with the probe workqueue Pierre-Louis Bossart
2019-05-28 15:07 ` Applied "ASoC: SOF: core: fix error handling with the probe workqueue" to the asoc tree Mark Brown
2019-05-24 19:09 ` [PATCH v3 4/9] ASoC: SOF: pcm: clear hw_params_upon_resume flag correctly Pierre-Louis Bossart
2019-05-28 15:07 ` Applied "ASoC: SOF: pcm: clear hw_params_upon_resume flag correctly" to the asoc tree Mark Brown
2019-05-24 19:09 ` [PATCH v3 5/9] ASoC: SOF: pcm: remove warning - initialize workqueue on open Pierre-Louis Bossart
2019-05-28 15:07 ` Applied "ASoC: SOF: pcm: remove warning - initialize workqueue on open" to the asoc tree Mark Brown
2019-05-24 19:09 ` [PATCH v3 6/9] ASoC: SOF: control: correct the copy size for bytes kcontrol put Pierre-Louis Bossart
2019-05-28 15:07 ` Applied "ASoC: SOF: control: correct the copy size for bytes kcontrol put" to the asoc tree Mark Brown
2019-05-24 19:09 ` [PATCH v3 7/9] ASoC: SOF: ipc: fix a race, leading to IPC timeouts Pierre-Louis Bossart
2019-05-28 15:07 ` Applied "ASoC: SOF: ipc: fix a race, leading to IPC timeouts" to the asoc tree Mark Brown
2019-05-24 19:09 ` [PATCH v3 8/9] ASoC: SOF: Intel: hda: fix the hda init chip Pierre-Louis Bossart
2019-05-28 15:07 ` Applied "ASoC: SOF: Intel: hda: fix the hda init chip" to the asoc tree Mark Brown
2019-05-24 19:09 ` [PATCH v3 9/9] ASoC: SOF: Intel: hda: use the defined ppcap functions Pierre-Louis Bossart
2019-05-30 16:33 ` Applied "ASoC: SOF: Intel: hda: use the defined ppcap functions" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190524190925.5931-3-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.