From patchwork Tue Oct 30 15:35:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149750 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5616328ljp; Tue, 30 Oct 2018 08:35:28 -0700 (PDT) X-Google-Smtp-Source: AJdET5d3ZXYSqgXzjTxNXPHa2XuQsPHYz6iuHr7/fExSlN/z6tv9/adTvGkFB8KL0+0bQzOXVpOU X-Received: by 2002:adf:c709:: with SMTP id k9-v6mr12425843wrg.197.1540913728022; Tue, 30 Oct 2018 08:35:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540913728; cv=none; d=google.com; s=arc-20160816; b=0cabYGiTeDMVq4l2CFl50DHfoZTCyFwZxk3JZG+f1JvvVYVn4RUrbmu4Wv62Q+WDcs 5ttDnHvPNPUYUeBlIgCeqQj+ayBgz86iyvs3z4J2EjA3TR7Q149Yha0GDRtbsK0pD4iC cnXLqIEHuUJxR5NhD/ATysC+loti93jIX2YxL9hNQLjuUQQw/p3K7P7Cl27QH9NwWIA2 A8kg3kQNifOrGviu+/JKrErvdsRbBIjdW+tKUSmFUwD1S1WlPkN+iU9k3yRTpLePm37B Uk/YMM9Ej1shLXgXcxRchfblBJFCAOU0Z7DWlMKs6b8wdeANfEKky7ajziGLoFy6t5Zk meyg== 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; bh=IDtCPX9SfoyMryQCoAtgiCajWGvQVhr6wDdr5FON1dE=; b=BFRiDxSfXhCuc+2RiwH8wPMKK1y4t+bWX6nO7o6oPTXTgFeh9KjF/510N2qp9m0jT7 16xm4cKaAIAsahYcpdmtWC0aei0fhsk5GOFjbThEtr/pI/9Lv8VOy8Wq+EYrbtmnIe6R nN3OOFNUyEeDTWCz7y4EzNWe0hGpQKMXL5Pj+ZY0Sl33T8aeMbHJkit35GTedVyhgjd5 VazQiEiZk8+ihOEM7iI65KL4IrhRq/ksdRVZB6zziadpWH60dXSNTSoPRIdM+1fVVNB6 ygxJPbuzhm+xKIG+6BcNN4myFmTplv/nFwszd8AYg/Z06m+OaBOuUKrmGsPGUHtTrZZF tbcA== 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=RG84BjjS; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id q17-v6si15299887wru.165.2018.10.30.08.35.27; Tue, 30 Oct 2018 08:35:28 -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=RG84BjjS; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2CB0B26770D; Tue, 30 Oct 2018 16:35:26 +0100 (CET) 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 C90D12677D0; Tue, 30 Oct 2018 16:35:22 +0100 (CET) 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 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 B510C26751A for ; Tue, 30 Oct 2018 16:35:19 +0100 (CET) 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=RhRcYKCSiw5B5SEERKk70aohIKj+p6o4TmGnD0oHrq4=; b=RG84BjjShKef Wfg1/PswV3UODN2WjEKsUsgaehbvGdZ8R30og0o+mpKWpFJMvzcKnbWjQfSPaj+uBhkujcMgQVO1l k5T2AKwI8cBrjGF5R38bq9X/BH8dW4SnBUcw0wyA253uX7y6UhPTKU7Sc1rui3oUqYF6pgYOGb4es FWffU=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gHW33-0002Wq-8Z; Tue, 30 Oct 2018 15:35:17 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id C511211239A7; Tue, 30 Oct 2018 15:35:16 +0000 (GMT) From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20181026215443.29081-1-pierre-louis.bossart@linux.intel.com> Message-Id: <20181030153516.C511211239A7@debutante.sirena.org.uk> Date: Tue, 30 Oct 2018 15:35:16 +0000 (GMT) Cc: tiwai@suse.de, alsa-devel@alsa-project.org, broonie@kernel.org, Kuninori Morimoto Subject: [alsa-devel] Applied "ASoC: fix oops w/ for_each_rtd_codec_dai_rollback() macro" 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: fix oops w/ for_each_rtd_codec_dai_rollback() macro 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 23cb2d04db54535df65edbbebbca89f2590f08bd Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 26 Oct 2018 16:54:43 -0500 Subject: [PATCH] ASoC: fix oops w/ for_each_rtd_codec_dai_rollback() macro A kernel oops happens on an error case (usual missing BE mixer configuration required by Intel SST driver). Git bisect points to this macro and an operator precedence issue. for (; ((i--) >= 0) && ((dai) = rtd->codec_dais[i]);) The initial code replaced by this macro was while (--i >= 0) { codec_dai = rtd->codec_dais[i]; Fix the C operator precedence difference by reverting to pre-decrement Fixes: 0b7990e3897 ('ASoC: add for_each_rtd_codec_dai() macro') Cc: Kuninori Morimoto Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- include/sound/soc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/include/sound/soc.h b/include/sound/soc.h index f1dab1f4b194..70c10a8f3e90 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1192,7 +1192,7 @@ struct snd_soc_pcm_runtime { ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \ (i)++) #define for_each_rtd_codec_dai_rollback(rtd, i, dai) \ - for (; ((i--) >= 0) && ((dai) = rtd->codec_dais[i]);) + for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);) /* mixer control */