From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30136C43381 for ; Wed, 13 Mar 2019 19:21:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED70F213A2 for ; Wed, 13 Mar 2019 19:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504878; bh=bB3XKKGSCcaLkfF9pcDG7eHbSSJOmJpmYEIvXa3gOUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=D+0pvW+kCKu3fuwqww79pMWyIKmVZnFxZ+oq5R0+7x/nfQ/Su0ci6igCewnqxumLb 9ryobIuGtWBgRHn/9hPdbaRn6qseYU+eNUXcb1W5Z8RuaazPVVGP51YKlI0DbUXsN2 kp9kWwGMvSKTArHV9qUfzUbTZI4keH86ueXZYbgI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728216AbfCMTVR (ORCPT ); Wed, 13 Mar 2019 15:21:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:48984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729053AbfCMTS1 (ORCPT ); Wed, 13 Mar 2019 15:18:27 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A8B2F2171F; Wed, 13 Mar 2019 19:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504707; bh=bB3XKKGSCcaLkfF9pcDG7eHbSSJOmJpmYEIvXa3gOUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bx7juyn9//eUmc6AFt2w6htqDHgfqjKzof/Os17J9BJk8yFYpltwd8zNRG1pAiWa7 Z4GNrwna7Onh1mDFdvcOXMF+B6Y04M3L2hB7eXhUQ62+icDo7oSLdh7lngCFJczyHL niY1IDYygWDzgMaecnfOcfTLL/9kWYKQABZ/IGtw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bard liao , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.4 08/15] ASoC: topology: free created components in tplg load error Date: Wed, 13 Mar 2019 15:17:54 -0400 Message-Id: <20190313191806.160547-8-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191806.160547-1-sashal@kernel.org> References: <20190313191806.160547-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bard liao [ Upstream commit 304017d31df36fb61eb2ed3ebf65fb6870b3c731 ] Topology resources are no longer needed if any element failed to load. Signed-off-by: Bard liao Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-topology.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index c1e76feb3529..824f4d7fc41f 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1770,6 +1770,7 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, struct snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id) { struct soc_tplg tplg; + int ret; /* setup parsing context */ memset(&tplg, 0, sizeof(tplg)); @@ -1783,7 +1784,12 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, tplg.bytes_ext_ops = ops->bytes_ext_ops; tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count; - return soc_tplg_load(&tplg); + ret = soc_tplg_load(&tplg); + /* free the created components if fail to load topology */ + if (ret) + snd_soc_tplg_component_remove(comp, SND_SOC_TPLG_INDEX_ALL); + + return ret; } EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load); -- 2.19.1