diff options
| author | Jonathan Hunter | 2019-03-04 14:31:14 +0100 |
|---|---|---|
| committer | Mark Brown | 2019-03-04 16:23:41 +0100 |
| commit | c342febcde452f817cbd3896dc40953ab17c309d (patch) | |
| tree | 185061079649402bf52cb8cdaabb89fb8c655384 | |
| parent | ASoC: hdmi-codec: avoid limiting params->msbits in hw_params() (diff) | |
| download | kernel-qcow2-linux-c342febcde452f817cbd3896dc40953ab17c309d.tar.gz kernel-qcow2-linux-c342febcde452f817cbd3896dc40953ab17c309d.tar.xz kernel-qcow2-linux-c342febcde452f817cbd3896dc40953ab17c309d.zip | |
ASoC: soc-core: Fix probe deferral following prelink failure
Commit 78a24e10cd94 ("ASoC: soc-core: clear platform pointers on error")
re-worked the clean-up of any platform pointers that may have been
initialised by the function snd_soc_init_platform(). This commit missed
one error path where if any of the prelinks for a soundcard failed to
initialise, then these platform pointers would not be cleaned-up. This
then prevents the soundcard from being initialised following a probe
deferral when any of the soundcard prelinks cannot be found.
Fix this by ensuring that soc_cleanup_platform() is called when
initialising the soundcard prelinks fails.
Fixes: 78a24e10cd94 ("ASoC: soc-core: clear platform pointers on error")
Signed-off-by: Jonathan Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 93d316d5bf8e..5a5764dba147 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2797,6 +2797,7 @@ int snd_soc_register_card(struct snd_soc_card *card) ret = soc_init_dai_link(card, link); if (ret) { + soc_cleanup_platform(card); dev_err(card->dev, "ASoC: failed to init link %s\n", link->name); mutex_unlock(&client_mutex); |