summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2022-09-20 01:57:11 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-26 12:35:48 +0200
commitf7f425d61de9bd5812fcf399888b7275afb97b58 (patch)
tree2709f1d35e0842086805735c491a4eba397b97d4
parent093a5463aeecc8a8d13bac233652cf6532d53dd7 (diff)
downloadlinux-f7f425d61de9bd5812fcf399888b7275afb97b58.tar.gz
linux-f7f425d61de9bd5812fcf399888b7275afb97b58.tar.bz2
linux-f7f425d61de9bd5812fcf399888b7275afb97b58.zip
soundwire: intel: fix error handling on dai registration issues
[ Upstream commit c6867cda906aadbce5e71efde9c78a26108b2bad ] The call to intel_register_dai() may fail because of memory allocation issues or problems reported by the ASoC core. In all cases, when a error is thrown the component is not registered, it's invalid to unregister it. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20220919175721.354679-2-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/soundwire/intel.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 38e7f1a2bb97..89ee033f0c35 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -1407,7 +1407,6 @@ int intel_link_startup(struct auxiliary_device *auxdev)
ret = intel_register_dai(sdw);
if (ret) {
dev_err(dev, "DAI registration failed: %d\n", ret);
- snd_soc_unregister_component(dev);
goto err_interrupt;
}