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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 770C0C43381 for ; Fri, 22 Mar 2019 12:57:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A94221873 for ; Fri, 22 Mar 2019 12:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553259423; bh=peIsyq0CbtMuwaaYVMce0ZMVI/H328ZMrM4lCMMSC2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2p/q3dKuA5d7lLenKD/L5HBNBmAq6uzRaltm3kbGEuhqibwtTEi/ksJbO6ekQfFPU ctfhyciFwkHMsou5HbSkA+SaKJ0eoaoJT+8PdlpYo2TAoGA5w4BBSKWr/a2BJKy2wH YiL6gzca0Eeq7Rrcs4f6K4kZYHJ+VTZkgEtfkxkQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731832AbfCVLsa (ORCPT ); Fri, 22 Mar 2019 07:48:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:51852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730828AbfCVLsa (ORCPT ); Fri, 22 Mar 2019 07:48:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E7D802082C; Fri, 22 Mar 2019 11:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255309; bh=peIsyq0CbtMuwaaYVMce0ZMVI/H328ZMrM4lCMMSC2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rBC6CqgiwK8Y9hcjA4skqtT1njQkEpF+XEUmz/KKU+Z4lTAhD60v9nMxfIrp2Namh i2Vbo2XswaZsRZeFwWi+kmgncqlD4eSpgeVqaNDtCVDjhjO4nP1aVytVo3oaaj+/Uu UDbmcLKhAIRRlSq0ZerFXB/UobhUN/N+64Dq8tYg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bard liao , Mark Brown , Sasha Levin Subject: [PATCH 4.14 050/183] ASoC: topology: free created components in tplg load error Date: Fri, 22 Mar 2019 12:14:38 +0100 Message-Id: <20190322111245.334828947@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111241.819468003@linuxfoundation.org> References: <20190322111241.819468003@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 c1619860a5de..2d5cf263515b 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2513,6 +2513,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)); @@ -2526,7 +2527,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