From patchwork Tue Jun 26 15:10:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 139994 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5362351lji; Tue, 26 Jun 2018 08:11:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeabzjxQH4dsOt3OIk2IVHv4yO9WW4hZuo0pvnKDyfx2sST5Rzpp/mVqTb0pDywn1hgBnN5 X-Received: by 2002:a1c:7401:: with SMTP id p1-v6mr1950987wmc.14.1530025866703; Tue, 26 Jun 2018 08:11:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530025866; cv=none; d=google.com; s=arc-20160816; b=mS5jTveuNwz6yK2zqGrO97tgAONb9NIoEPBUxx1RcKM/SqqrDsLJGS9CZWfq/BkOne AH9t/ngCsv5yF12DsdZs0dNE7fFp/CEOdo2pb5KIgztmYey0GzB66Z2GHtf4kW3V+nag WNPbjo8/QpnOV/w3gw7iJxnrrYyZjiAIbRCqtWuWUvQX7RN7Olca5eyQuBx1SaSphbyK IsMB09fXponbvP08Wyp6V4fhAxvez8S54m5yORkfDxpr/0aCUX8fHGbUz86/GjlkP9qh SNzJKXHJauRzrvLDOmtXChZUzqkEEM3yQjTu9ouL57gO0Oxk+kjtj8PEy1YLKTWBqGFZ ffXA== 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=JVdgAp8Txjw2vSF2GWHR/ud6G/9vRkm31r5OjfkWRxw=; b=InINp3vBJ9nhSAEzPcoBKe195LJPGHUy5j3jPsEwEtaDY3+87x1U1bYNLmjCt7H+0F AaXGB9x34U+0j3YBeI+GndIGrckinpQTRcxRPtbPykpU4ZdOCMo/LbFR5HL9hk/CA5S7 IWZqtMsQU5nc2gMB84RL14SEqmpI/GiQBSlrmaAHWHZd7G06pqlTK7Wz5ffdM7HE9Xfe crT6nKXY7FPSmViqEM8oe7OLfcSa2McEvQLQsi7jtv2ifZByuleqA+QJh3gUsyJvcN0B HXDgSTNj6O2gZ/yl34aXdI//wq5uDrT2+agx5GPG0rB6MF0zy1OXed7riTSwaFt5j1HW zFMg== 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="e9QqzZw/"; 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 f18-v6si725506wre.357.2018.06.26.08.11.06; Tue, 26 Jun 2018 08:11:06 -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="e9QqzZw/"; 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 1DC792678FF; Tue, 26 Jun 2018 17:11:02 +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 EA7C02678FB; Tue, 26 Jun 2018 17:10:58 +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 6AF87267705 for ; Tue, 26 Jun 2018 17:10:57 +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=f8E0QZ5kIkkDj+moXtR1UOhyCa/hS5DyDK5M8qzmfYA=; b=e9QqzZw//Q8/ OM29UCWcOU2YcfEDZDeaMk0DC/05FoAdbzUTVcdV58xJTLbNbsyC80/StkmkLTg17DZyLp/roMPT4 L7kzaXDujRVoJSPYK0fm+PByqMDlKrxnXme4xVI2TMuEq1s8/uJ31VNE3CmkE1s8syG10urXydCXO durmg=; Received: from host109-146-194-33.range109-146.btcentralplus.com ([109.146.194.33] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fXpcM-0001JQ-UW; Tue, 26 Jun 2018 15:10:55 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 6E282440070; Tue, 26 Jun 2018 16:10:54 +0100 (BST) From: Mark Brown To: Srinivas Kandagatla In-Reply-To: <20180625143115.8346-12-srinivas.kandagatla@linaro.org> Message-Id: <20180626151054.6E282440070@finisterre.ee.mobilebroadband> Date: Tue, 26 Jun 2018 16:10:54 +0100 (BST) Cc: rohkumar@qti.qualcomm.com, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, bgoswami@codeaurora.org, linux-arm-msm@vger.kernel.org, plai@codeaurora.org, tiwai@suse.com, robh+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, srinivas.kandagatla@linaro.org, niklas.cassel@linaro.org, linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: qdsp6: q6routing: add proper error check" 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: qdsp6: q6routing: add proper error check 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 972562f7aaaa261ec6e1ac14fed0c5bdd0dfb1cb Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Tue, 26 Jun 2018 10:20:15 +0100 Subject: [PATCH] ASoC: qdsp6: q6routing: add proper error check q6adm_open can return error pointer or a null in error cases. Fix the return handling. Signed-off-by: Srinivas Kandagatla Acked-by: Niklas Cassel Signed-off-by: Mark Brown --- sound/soc/qcom/qdsp6/q6routing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index ab696bf8d1d3..c80fdbc2442e 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -310,7 +310,7 @@ int q6routing_stream_open(int fedai_id, int perf_mode, session->channels, topology, perf_mode, session->bits_per_sample, 0, 0); - if (!copp) { + if (IS_ERR_OR_NULL(copp)) { mutex_unlock(&routing_data->lock); return -EINVAL; }