From patchwork Wed Jul 4 14:42:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 141069 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp886932ljj; Wed, 4 Jul 2018 07:42:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdQlVHQUYVAbIQCZF6LgVvJygfFcHdsvvKGuEeWNuyCIBFMAoocXyVxTdN7EY6Dr37iNdE1 X-Received: by 2002:a1c:81c5:: with SMTP id c188-v6mr1661739wmd.122.1530715362748; Wed, 04 Jul 2018 07:42:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530715362; cv=none; d=google.com; s=arc-20160816; b=bcpDLEn+bZ1BPjnw6uIxDVVdcsCql6S0SqQVN/sGqdt3cUN1fk05wqtLjgFr0hkJZZ UQQhOKhk+F3xo3J9fI46D1neRFDQvMBgFUoTVFR13kwwEPDlnyP0KRlJVaVTI11TDasx VnNTR3PzEzwEoSWzFirwJt5M7CT0LN8TDBJ0t2D8/K+VmI7fuwILmWbJ8zTTrHfBclAc gWz+YhAXSOXMG6zQkfwYa4KLYT9pW//84DRwb7Kcs373YSv5lrg9q7plCsJ5k2GoXqEg QN9vJqoFgw2PSqcovuRXD1eQk6ZWGcb4LUv9tXSf/dRBdJXOM9J5Mg/Wk/q8fSFtRDOl fX/w== 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=u5752AFxNiXqm6IJMt2cHiHaamnWZlnJrUONVzB+ABw=; b=RZ6CZN9ALRkCaKv1P6RzMqtY5dH0mvz5WP/Ek0JSSdgrjYoI3e5rGb2PFyvBeeiaY/ 3hfbFOTXx1xfNrC+XfSBMZ/mhZj9vQX2kQyajNkhniIiKKnQWCFc0ac0G5LatwxZfQAl OjHNIure8Y/B0LVt6fJ57qTDCbyLnj7gm0cVCnO/TO6KtAoYH5CRjiYvDl3S9JtVO6IV Gmdl5VilTlIv0RHV5qE1OVIN45VfXbh+tDdrf/fMhqezCXTTjoA76sT1G7pEuOVvQS+q rHZNcL9ND6G414o4vQaJu5pDGWkXmPRcPqpYLcy3V1mSNnm10uy4njIeRbeuAuAScurp Fxlg== 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=PK9gjiC6; 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 l1-v6si3345303wri.191.2018.07.04.07.42.42; Wed, 04 Jul 2018 07:42:42 -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=PK9gjiC6; 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 BDB75267790; Wed, 4 Jul 2018 16:42:21 +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 B41F6267766; Wed, 4 Jul 2018 16:42:16 +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 C71B5267766 for ; Wed, 4 Jul 2018 16:42:13 +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=yyg8WdlcsKigY5G74Odewn3cUgDTwhmEdkU/yHybSY8=; b=PK9gjiC6WMBU GU66I8bd5oVcunVsJ2DO7EIHL+cNvNwtDSpoJa2NVzYX9mSfG5SSE9UvlhF9J2ei/HFLeZvMoQZCO 9r7EjldhJY0ljVIH5NlZFtqFp/bq7GCG2xfIknPnEN8n/Q87xcHcrL0r20grz6JycwBdBQl7xH281 e4JmQ=; 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 1faiyv-000746-KP; Wed, 04 Jul 2018 14:42:09 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1faiyv-00042j-5k; Wed, 04 Jul 2018 15:42:09 +0100 From: Mark Brown To: Takashi Iwai In-Reply-To: <20180704140146.6768-3-tiwai@suse.de> Message-Id: Date: Wed, 04 Jul 2018 15:42:09 +0100 Cc: alsa-devel@alsa-project.org, Banajit Goswami , Alexandre Torgue , Patrick Lai , Peter Ujfalusi , Mark Brown , Maxime Coquelin Subject: [alsa-devel] Applied "ASoC: qcom: Use snd_pcm_stop_xrun() helper" 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: qcom: Use snd_pcm_stop_xrun() helper 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 1a42e7e3aff1aa4789378020318dff7432317d25 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 4 Jul 2018 16:01:44 +0200 Subject: [PATCH] ASoC: qcom: Use snd_pcm_stop_xrun() helper The XRUN trigger from the driver should be done via snd_pcm_stop_xrun(). It fixes the missing stream locking as a gratis, too. Signed-off-by: Takashi Iwai Signed-off-by: Mark Brown --- sound/soc/qcom/lpass-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 31fe78aa207f..d07271ea4c45 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -458,7 +458,7 @@ static irqreturn_t lpass_dma_interrupt_handler( return IRQ_NONE; } dev_warn(soc_runtime->dev, "xrun warning\n"); - snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stop_xrun(substream); ret = IRQ_HANDLED; }