From patchwork Wed Feb 14 13:29:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 128340 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp611829ljc; Wed, 14 Feb 2018 05:31:49 -0800 (PST) X-Google-Smtp-Source: AH8x227MVWs5QoTja7kUZoslANDKPT5EiA/QtrGd8Vs+jJ9oAItBn0VGH9zY3fwxlPG3ckNpoUyy X-Received: by 10.28.140.9 with SMTP id o9mr4293251wmd.28.1518615108974; Wed, 14 Feb 2018 05:31:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518615108; cv=none; d=google.com; s=arc-20160816; b=EcYKhAMPxawJzMuA71ordahl2NQZ0VOUNr5Nx71w66MH6lpaVMdaMkHPwZMPsqdqpC JbBaXr1yBxTaRd5IGUt9fsTEHg/8HzjmH4ppyGxI/HMnW5cByJ+l0QN99KKk3q+H5EAs uTvb8iHSeyvWhEdzDd0gbS787D7upiSw4z6dJ4+DHK9zQALgvkNcPyANMYz/+PnzoxEN Xs3EtVKUfBismUE+EjTWCVhoFH3AwmYDoMlUXfqGRERRaODc+LA7Rx5gtZP6YKisErvg LSBDbGNY5DdE8QL1+bQsjJsej37JHTY0ZlpTiyLHLYwBQIvVu46Hk0FPZV7fajSEbg5U 89Bg== 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=Urmx4JGszUPt7+K8WIPAYqXSIt9jl9KiU7grk1ePP8Q=; b=tB+VxUlHxo83jCn25bsIYkFlY5UQaAKpRJFOGvab02da6y8WWa6V2+BKTEtw1lBK9O azDicPjgQmmvvGjWRTOL3TgEZICZUT0408jKpEsN/QcccCJqSRQkmiLNXqpEbGgsn39X NrvqOr/vKS5sqKvDkuc96JaL3n9ovtxl0/IV1LE50qVji8ogh3ApBRHKGh+RKy9TNwMx myVme1T89AiQE6T+HHBZZTfHuZyuj4qWR4yo9UKv5SoxcyI8IxRZsQyduhoY0fcbY9JE 0KWGFrVoXzsURO7lrm0a5XHHEETv6l622BH701890AJ2RdPF/RV4rBklJvggZcaduCTi uvMg== 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=EjI6eEQp; 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 23si9792364wrz.413.2018.02.14.05.31.48; Wed, 14 Feb 2018 05:31:48 -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=EjI6eEQp; 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 B22AB267BB3; Wed, 14 Feb 2018 14:30:42 +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 76976267BB2; Wed, 14 Feb 2018 14:30:40 +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 B448F267B31 for ; Wed, 14 Feb 2018 14:29:41 +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=nUvWm3l7KNb6RIfrJirzF2cZgJHR3Ci6Ifb524NmEZ4=; b=EjI6eEQpTV1g tBSL6csBNDIoeqTKjr11WDy0vpxG5jydSMhykom28uCNeH1DqXltuqqMglrWpyQY3Z1RV3FEZ31vB DTDFIB2yt6V7a4biQjCGjjnMtyVmK9RGMfdZJscHt83vqSnOoDhDcZ8KmSFo5VBM7OeUgo07jH0du UMxW4=; 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 1elx7s-0004qB-MU; Wed, 14 Feb 2018 13:29:32 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1elx7s-00075e-8E; Wed, 14 Feb 2018 13:29:32 +0000 From: Mark Brown To: Dan Carpenter In-Reply-To: <20180214071531.GB26677@mwanda> Message-Id: Date: Wed, 14 Feb 2018 13:29:32 +0000 Cc: alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org, Takashi Iwai , Liam Girdwood , Katsuhiro Suzuki , Masahiro Yamada , Mark Brown Subject: [alsa-devel] Applied "ASoC: uniphier: fix an error code in uniphier_aio_comprdma_new()" 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: uniphier: fix an error code in uniphier_aio_comprdma_new() 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 21957b5bf0ff607e6e0ed55a3a89454e969511ba Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 14 Feb 2018 10:15:31 +0300 Subject: [PATCH] ASoC: uniphier: fix an error code in uniphier_aio_comprdma_new() The dma_mapping_error() returns true or false, but we want to return -ENOMEM if there was an error. Fixes: e98131222ff9 ("ASoC: uniphier: add support for UniPhier AIO compress audio") Signed-off-by: Dan Carpenter Tested-by: Katsuhiro Suzuki Signed-off-by: Mark Brown --- sound/soc/uniphier/aio-compress.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/uniphier/aio-compress.c b/sound/soc/uniphier/aio-compress.c index 7f7abe3ae99d..4751c8bdabec 100644 --- a/sound/soc/uniphier/aio-compress.c +++ b/sound/soc/uniphier/aio-compress.c @@ -54,12 +54,11 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd) dma_dir = DMA_TO_DEVICE; sub->compr_addr = dma_map_single(dev, sub->compr_area, size, dma_dir); - ret = dma_mapping_error(dev, sub->compr_addr); - if (ret) { + if (dma_mapping_error(dev, sub->compr_addr)) { kfree(sub->compr_area); sub->compr_area = NULL; - return ret; + return -ENOMEM; } sub->compr_bytes = size;