OSDN Git Service

ASoC: soc-core: Fix probe deferral following prelink failure
authorJonathan Hunter <jonathanh@nvidia.com>
Mon, 4 Mar 2019 13:31:14 +0000 (13:31 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 4 Mar 2019 15:23:41 +0000 (15:23 +0000)
commitc342febcde452f817cbd3896dc40953ab17c309d
tree185061079649402bf52cb8cdaabb89fb8c655384
parentbbf62563d8622434c761cb96569c132467f88597
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>
sound/soc/soc-core.c