From patchwork Fri Jun 30 11:59:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 106685 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2236917qge; Fri, 30 Jun 2017 05:01:51 -0700 (PDT) X-Received: by 10.223.141.138 with SMTP id o10mr28971685wrb.69.1498824111640; Fri, 30 Jun 2017 05:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498824111; cv=none; d=google.com; s=arc-20160816; b=nptgxqKEQxgovMMmKRkzYyDkXwLkPCuPA9b7AoGrQPk4skOSt2Kxxhg7BKgg4L1Rp6 rCLCSfM0xQYNs6x98fzgLqykSbIfRL3aHwFccL0hn8SPn+ZpS0aPEG5sDa5RMf5ZDyRu EgKKSV0WM7ZJw7kY3mtbDsPzWZW9mKuRdu3iBd3LtLXy2t3ow5RfxXsLAgH5igCEL9Uz OXUXq7e19srP7i7Yl+smFkorRPi0cnDTvU6elzpBo5Nqr99g/8PvAquVl8ca898i7L3n IzF2EN8iDDM2D8jU/66In1gy93sJTAbqOuAsA1OYLkp9DROQODFW9UA0+zXcX2oWSlAW Nxdw== 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 :delivered-to:arc-authentication-results; bh=y1mlcjPI95KlnIC5nloYBEjKzWa11tLPqtXBwVLBRV0=; b=BGUCV+dqSr5qveWwFu+MHu+QtWU5sugSH2F1wPafc3P5QVBHnbOV2Jt0kuTdvqyqH5 bkHNRnkI12IqsRB5xbZvhPQTQX2JOUu6abalLpRbqLMrWe0Iiw//eBV+FCPUa/FLjdMN YJ5UB30ejqvDNI0LLRXUQ6OKEVxjd0T+0FIAqC5zqa9WSliSOUXO649SnjkeCNVp81A6 jtV/cOdprg4Qi84pty6Vv2sorBTK3uY/FPj+MPm1V+1RUuoiZU4CYJdXiyCSHSCUPbXL BKtPuRUqic9zoaGXyG/rVXIqVf+XKu02r4SPD/ypCaIxF72BcdM1HsntB96a1oz/FaYc 02xA== ARC-Authentication-Results: i=1; mx.google.com; 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 z126si3546807wmz.9.2017.06.30.05.01.51; Fri, 30 Jun 2017 05:01:51 -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; 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 258B22675BF; Fri, 30 Jun 2017 14:00:48 +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 5C0F32675A7; Fri, 30 Jun 2017 14:00:41 +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.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 0ADAA2674EF for ; Fri, 30 Jun 2017 13:59:43 +0200 (CEST) Received: from [176.12.107.140] (helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dQuaI-0001NF-Hm; Fri, 30 Jun 2017 11:59:40 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dQuaF-00084G-0j; Fri, 30 Jun 2017 12:59:35 +0100 From: Mark Brown To: Liam Girdwood In-Reply-To: <1498742546-23463-2-git-send-email-liam.r.girdwood@linux.intel.com> Message-Id: Date: Fri, 30 Jun 2017 12:59:35 +0100 X-SA-Exim-Connect-IP: 176.12.107.140 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: topology: Fix usage of SND_SOC_TPLG_INDEX_ALL during load" 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 usage of SND_SOC_TPLG_INDEX_ALL during load has been applied to the asoc tree at git://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 bb97142bcf8c042103e87d035a120f522d12e788 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Thu, 29 Jun 2017 14:22:25 +0100 Subject: [PATCH] ASoC: topology: Fix usage of SND_SOC_TPLG_INDEX_ALL during load SND_SOC_TPLG_INDEX_ALL is used by drivers to tell the core to load all topology component indexes, not just the index in the header. Fix this so that SND_SOC_TPLG_INDEX_ALL will load all components no matter their index. Signed-off-by: Liam Girdwood Signed-off-by: Mark Brown --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.2 _______________________________________________ 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 12e189701924..6070e35455aa 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2381,7 +2381,7 @@ static int soc_tplg_load_header(struct soc_tplg *tplg, /* check for matching ID */ if (hdr->index != tplg->req_index && - hdr->index != SND_SOC_TPLG_INDEX_ALL) + tplg->req_index != SND_SOC_TPLG_INDEX_ALL) return 0; tplg->index = hdr->index;