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 15307C43381 for ; Wed, 13 Mar 2019 19:13:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC2F4217F5 for ; Wed, 13 Mar 2019 19:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504435; bh=/56E3NWDocUKTbdGP3PeXr/w4r4OfAuGJydE2VpzYeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nRWQIC7tHIGDrZadu5AEJ9tjFWwUOd2peuttLOVgiMmJRRhcQUYmsy4XD2Q7EHX68 F7k5/d0rnIaywMb4ErjzTNKA8Vf5aQc77o6G7KPSOqdBJitA3ibjC+iGyAZlDju8wv kCeeCMyQHGoFNxNlAntvyQsbwX7gP7SI0mWB6FDQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728116AbfCMTNy (ORCPT ); Wed, 13 Mar 2019 15:13:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:44206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728055AbfCMTNo (ORCPT ); Wed, 13 Mar 2019 15:13:44 -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 163F7213A2; Wed, 13 Mar 2019 19:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504424; bh=/56E3NWDocUKTbdGP3PeXr/w4r4OfAuGJydE2VpzYeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NJdsijv76aPUAKvkrcPrxd6RZWAAheVGohpkknrBy7f7fOO9GhnHiQ5MHaGQvM9yA KEyrOzc8x2wx/m998xakvaxWFa/wy/aWLDwqwGetvWKRWj+PR9k6uGXpRrA3YqVcFu AExr97klYDgtm63K02sTgO6fbYM7fXs7dH5iYrr4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bard liao , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.19 20/48] ASoC: topology: free created components in tplg load error Date: Wed, 13 Mar 2019 15:12:22 -0400 Message-Id: <20190313191250.158955-20-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191250.158955-1-sashal@kernel.org> References: <20190313191250.158955-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 66e77e020745..88a7e860b175 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2493,6 +2493,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)); @@ -2506,7 +2507,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