From patchwork Thu Mar 1 18:07:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130372 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3114496edc; Thu, 1 Mar 2018 10:09:13 -0800 (PST) X-Google-Smtp-Source: AG47ELspDDUuN5V5D2QkHlqECgFVHpuvQV7nSvpFPe7f1xdNNNlIfPghKdLTzYVtbX/j/SCC/7B0 X-Received: by 10.28.192.24 with SMTP id q24mr2571639wmf.112.1519927753917; Thu, 01 Mar 2018 10:09:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519927753; cv=none; d=google.com; s=arc-20160816; b=ltBtc/VAWZTmWG4qd77KAePUFMnaRDLo9vhyGjiLTU7DWa6nslt52ZYU89vu3sforS VSloCjkB/1kvT9UL7LUqNOFAcZoKGGyumn4+VVYPEZJ7jc4UlVQNlZKFLOc3N/EPPe9S u2wsNHkDZM3+Oistk1qFG33DnBXri4VUt4wEZc19nzVIxsyH4TumeF16nhr1N8T4Xgz9 B15IiDcg4esNZ+BqKFQOwpvAtLQAmqvJ3nER5hXWsK0WI/qnWDKmmkZzCBopcw4w+n2Z WyYLoTIE/n9gusZ/jBjwezj0iqTIgCmJprSazrvBNLxPA2gDGICM+VK0CcbZM0xhaj2K 1Gew== 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=ASMpJUZbgDE2zDo6AJNTiEZUZis83m2rIxB+9xZpqsQ=; b=Ex4yhj7jIzmw+yf/ZpFFkDqgDZdgy/E4NbsBS82dBJMYp9ltovUPJ7aC0Ywt8nkbAD pgjCn2Da+dgbKPPCisLE7wobrFH3SHDIXAzQzomd4sU1HHBHg4PTL3OA/2PBJWkiCORK g13ZVHnTKdZJ7W5AO4k7AIqEJpAPYifFKYuJGUrXaXatOwE2UnFAfhDfNQJeSmt6dAvU QpzwpG35/EZrzupss0TzNcjyKwkejYmYkB0QNKYDJombufcDsK1te9zC20qd+UoDApER 8nPD3vNrxVu4uFvPAoAOghpDMeBjtB2m7Eoqgu1fFDHmPPm553z18IMl8R7cjypxcedW PkzQ== 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=vqjNvAon; 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 t22si3274567wrb.206.2018.03.01.10.09.13; Thu, 01 Mar 2018 10:09:13 -0800 (PST) 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=vqjNvAon; 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 F3027267B78; Thu, 1 Mar 2018 19:07:30 +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 3C73D267B66; Thu, 1 Mar 2018 19:07:25 +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, SPF_PASS, T_RP_MATCHES_RCVD 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 19261267B6F for ; Thu, 1 Mar 2018 19:07:23 +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=YJSY8UjIxo/iLThAxBPpNpxJfvJ/c1TNudVtGuaJYz8=; b=vqjNvAon1ow0 l0xqgcSVq3ca2kuhomhqI6FfNmaCwOa1ySvUlSMHePG+Oo/Eh56KbBDtdSYbgxpBk8lctEkkcgYph 6JP+yWnZgB6bgVnQRMdRa4EK++2yY6H2KhXFb18x0bgLC/hYkJBmt72bsGVHTQd+Uvocp8CWEQVO5 G63ws=; 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 1erSbx-0005Xn-CO; Thu, 01 Mar 2018 18:07:21 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erSbw-0005zY-Uh; Thu, 01 Mar 2018 18:07:20 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: Message-Id: Date: Thu, 01 Mar 2018 18:07:20 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: Intel: sst: Fix error-code check in sst_pause_stream()" 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: Intel: sst: Fix error-code check in sst_pause_stream() 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 6f5062773747b3d3eb9f957030ac1be98e983ac2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 18 Feb 2018 23:01:38 +0100 Subject: [PATCH] ASoC: Intel: sst: Fix error-code check in sst_pause_stream() The value returned by sst_prepare_and_post_msg() is a negated SST_ERR_* value, so we must check for -SST_ERR_INVALID_STREAM_ID. Note that sst_pause_resume() already has the correct check. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/atom/sst/sst_stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/atom/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c index 7ee6aeb7e0af..b082b0922a7a 100644 --- a/sound/soc/intel/atom/sst/sst_stream.c +++ b/sound/soc/intel/atom/sst/sst_stream.c @@ -253,7 +253,7 @@ int sst_pause_stream(struct intel_sst_drv *sst_drv_ctx, int str_id) if (retval == 0) { str_info->prev = str_info->status; str_info->status = STREAM_PAUSED; - } else if (retval == SST_ERR_INVALID_STREAM_ID) { + } else if (retval == -SST_ERR_INVALID_STREAM_ID) { retval = -EINVAL; mutex_lock(&sst_drv_ctx->sst_lock); sst_clean_stream(str_info);