From patchwork Tue Apr 17 11:28:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133535 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp4599313ljb; Tue, 17 Apr 2018 04:28:46 -0700 (PDT) X-Google-Smtp-Source: AIpwx49zR8R2IA8CHlWwTZ1h7MZgVqGXfUYkIqfwKvubAApkVofV03yoE58J1Yn+rv1d4CzdiXkP X-Received: by 10.28.156.2 with SMTP id f2mr731581wme.64.1523964525935; Tue, 17 Apr 2018 04:28:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523964525; cv=none; d=google.com; s=arc-20160816; b=xsKgFqkA0rFhlueSqzZCIy/gyDPlRfonCkdAicdeoxQopOE4g6t3BAN/UkzSOaffOG QN4Ly3PHRxkmrZe9gtQBK6Gvj2hkpYjZtjz+kJkgF2m/Hk3N4UG/px3GG0W31FF11tIV cRVbPwVO+tjaKVlbLTSfwa8apyeqLCMVSZQYUmtjhOmXKpET5rxESz9Q2i7uh0397pNn JTzIyYfX8uqL6Jfv/v2wxbQjZa+OhantwxlgxKtaX5E2PJzXZK3HM9y7gprRsIExExWs eVl/ujVs8BnDMZSKt4rUIwLaBZDnE80Gzj1LrtA3lYuGq6bBOZ2Tqo0h4zVUpwxCZnwp JOiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=p71pSX5mLh9KCbPzk/5Gw1rQJ+R9BlUNZcUq66EsQqw=; b=r6wko2qS57QtUnLZ6xXRTzCiir1CFTPSzV29YLq4eNicN8RoExAdZfPDvOOmHIndYS Fk7dr8gKHP7UOSXVrIh3YkNE9GhYYNlnofcRHDxYdZoNP+92jYUeBmtqFRv3BQNmma/e MgNhL5jqcn35MLhxq+V9UK7oRTOU3g80OIY9cO/wmDBt/oan9Tn7ZK0tjmhpyrJcz2ov 33gVYd8H1CQG4ihiHuqqrnM99nyACwjIGHVo8zcjt3K9UQJWUTXY1a9m87cLLrK4YNVR DYWBTP+EkZYbb/UOoMcR3hwor/lplQZHYoaAWy1P87oQGk/OXoEgzx4M/aw+lFiPJ91l JPyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=EhYBAAz4; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id l87si5577757wmi.57.2018.04.17.04.28.45; Tue, 17 Apr 2018 04:28:45 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=EhYBAAz4; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 359632675CF; Tue, 17 Apr 2018 13:28:44 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 476912675DB; Tue, 17 Apr 2018 13:28:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 230252675CF for ; Tue, 17 Apr 2018 13:28:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=vhCFurFSpAXAre0U8hOThpjjKqyG5J1ZYHBJj1d8KSc=; b=EhYBAAz4tYqK ivnR0tkft9yqsCfU/1wrMwf1HAHbZElWZaqcFDqzW1y/458JEyD2oebTXPBUMQZUhapkMvBJPIOX8 9l+ZhtGcEgTa+1R7BoGhDrBTLu17s3m2EXTCe61W0LxngqcEZulVGVQrLgfC9FaP845dwuAGOKJGz +tR7k=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f8Omr-0007c3-A0; Tue, 17 Apr 2018 11:28:37 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f8Omq-0000I2-Kk; Tue, 17 Apr 2018 12:28:36 +0100 From: Mark Brown To: Yan Wang In-Reply-To: <20180314204722.14144-1-liam.r.girdwood@linux.intel.com> Message-Id: Date: Tue, 17 Apr 2018 12:28:36 +0100 Cc: Liam Girdwood , alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: topology: Fix bugs of freeing soc topology" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: topology: Fix bugs of freeing soc topology has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From feb12f0cd8d7b1e8df2e6fce19fc9a026a468cc2 Mon Sep 17 00:00:00 2001 From: Yan Wang Date: Mon, 26 Mar 2018 16:48:00 +0100 Subject: [PATCH] ASoC: topology: Fix bugs of freeing soc topology In snd_soc_tplg_component_remove(), it should compare index and not dobj->index with SND_SOC_TPLG_INDEX_ALL for removing all topology objects. Signed-off-by: Yan Wang Signed-off-by: Liam Girdwood Signed-off-by: Mark Brown --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 942c6e5eb4b7..5598e891b2b3 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2580,7 +2580,7 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index) /* match index */ if (dobj->index != index && - dobj->index != SND_SOC_TPLG_INDEX_ALL) + index != SND_SOC_TPLG_INDEX_ALL) continue; switch (dobj->type) {