From patchwork Wed May 30 15:34:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 137263 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5474931lji; Wed, 30 May 2018 08:34:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIBkLjCHgPt4RjJafXDT/UqeZzLcxXmG66cHnR0n0nBIj2Sma+ZwyL7OYPJ9NL0n9lgS7LQ X-Received: by 2002:a1c:a84d:: with SMTP id r74-v6mr1955670wme.114.1527694493308; Wed, 30 May 2018 08:34:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527694493; cv=none; d=google.com; s=arc-20160816; b=zakHq/eYfdM/Nel+EnvXGxhkb2Nuuy5z2yKzEQyfn0bXzcX3t7c92+PmWnahC1Y/YP H4GBhpd1oR5opeJFxmV2YIeXuH9KQbYfSK77H+rQXhzlfBhErFNWkVQNTfD6OeC4N1gC BrpaWudXM4dmP5Pf+99Lf5chzapsSrqMex0CXvojPciHw8MVliYNrGxGMCnSJIZn6gsP dTFYfdhgg2Z02ek+vBZMr4LGdsyLowX/1SHzbIkB8fZaVmNvrVXvoU2OjV7s4dt5Q2e9 K0jquQN7fmTR8crY1Hansup1jLo6BizqKcSWfgBxqrroA3sld0eOuSKRfhz6X7/cYE7k 6/aQ== 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=dW7SmvDW6PLbKTooFh+mREo69ZhCuqUEzk3Bp7bYLgg=; b=t6OYNcKfICOMq2v1MPnNEqPIv59ZZzasZocLKvHB9r9GL1OwpaDrxRg13Tb+TH8MWL obUJUO+n5RA/2qdWwsuH0T4F36PN2z2bZMsfonqOZB0tuMlRDSEAID/FKtFAByBpTgin attLRMiQDlpniu8CR1Dw37yzMpEy99CyfUfP69Xa7xfhNws6c7Fx9FNp8Tz5SMaz/MHU UOKef2mCCd6LAUnOuPWza+S7y906iU6L1aIoTR6YgHTbCQuzKuGN+Y9cBSSI340qFjpu sM4zLCVTjQX6WwUTp8jXXhPKko3KCmDg43QMdMh2mxSJMoL1HMqLKNDSLxJr7GplEqx5 oTzg== 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=qFGnMsPu; 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 d131-v6si6752111wmc.196.2018.05.30.08.34.53; Wed, 30 May 2018 08:34:53 -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=qFGnMsPu; 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 B239026775C; Wed, 30 May 2018 17:34:49 +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 6C52026775E; Wed, 30 May 2018 17:34:47 +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 ED59F267757 for ; Wed, 30 May 2018 17:34:44 +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=OglrwblesQNsRJL/z3Twqr95e87h8P6ySDtEWUyqnTM=; b=qFGnMsPupDA4 jr5ix4JK1BUG+6GUNycrk4nkbKvjB0vxn9PziAQ8l/jr0x4quzdZyi7KBC9QIVECAQwxYcHd2ZnZB qJA/YirZRQ5qvocjLEGjw5BVMHQsbSh9mGXxrAJzRoFPTl20EfhDFMkUt2hoZ/nbWAcmjx81u3SIO QkZJQ=; 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 1fO37Z-0007Sg-RB; Wed, 30 May 2018 15:34:41 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fO37Z-0006g0-2x; Wed, 30 May 2018 16:34:41 +0100 From: Mark Brown To: Jon Hunter In-Reply-To: Message-Id: Date: Wed, 30 May 2018 16:34:41 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: core: Fix return code shown on error for hw_params" 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: core: Fix return code shown on error for hw_params 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 b91530f0a39edd82aa1b286bd921d052eb747f31 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Wed, 30 May 2018 16:15:19 +0100 Subject: [PATCH] ASoC: core: Fix return code shown on error for hw_params When the call to hw_params for a component fails, the error code is held by the variable '__ret' but the error message displays the value held by the variable 'ret'. Fix the return code shown when hw_params fails for a component. Fixes: b8135864d4d3 ("ASoC: snd_soc_component_driver has snd_pcm_ops") Signed-off-by: Jon Hunter Signed-off-by: Mark Brown --- sound/soc/soc-pcm.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-pcm.c b/sound/soc/soc-pcm.c index 0e2b2c6c60bd..5e7ae47a9658 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -956,7 +956,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, if (__ret < 0) { dev_err(component->dev, "ASoC: %s hw params failed: %d\n", - component->name, ret); + component->name, __ret); ret = __ret; } }