From patchwork Thu Oct 4 10:42:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 148115 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp780731lji; Thu, 4 Oct 2018 03:42:48 -0700 (PDT) X-Google-Smtp-Source: ACcGV62dnSHS+Z9mJTRGAtykWjjWLK4Rt+CDh0mElOvX9cubOQSBITudgASezkEz1iTrULVfFT+u X-Received: by 2002:adf:c989:: with SMTP id f9-v6mr4267735wrh.148.1538649768318; Thu, 04 Oct 2018 03:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538649768; cv=none; d=google.com; s=arc-20160816; b=JYci8KgjgxA3W8ryNCL/6FD/lafGB7ieYquk4DlPFvRYkhemRRXU1P5IQIbECBamQe KvTToxP9XPBAv4WjxHXMvha0760x8NpErEvgEyaeRPxsF7y4OKAhtBiSWnEFhjFBTC5V n2iuHloKwu3yFzjTOt1nuwrh7P/xM7FGNlU2umly7SU3T3Lj0Ei0UtUmv19cvqyboNXt 4bcLjAMlE3owcumftW/muit72q11uv9CY3aHCSE3faYNoulL0D8ijuwz5hPKFkib69JR sMeKuYCalnKSFluhXiHotH550slZ6U/HsI+43/Ru9rcBQT53mC3wnIL95hu8rWObIivQ ClZA== 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; bh=WJuACCKMFxFacKQfu2MbgvQ17l4SYl4KZy81yxYIq9s=; b=TBIJDmn4mfRWflzT5Za+xWzF9HbKBZIXCmSZQ15KSw91pK2N8Br34tEObpa0YTCXR/ nKsX7Sss/BK9GWBSKsRFBleez8aUzGqCpl3omK3l0nnl7HdkFjnkh+AzjhPr+0gDCake S1yNXOkIS+rHqAnrwWD7sM1C9fuOZXUEqKzWg2oc+F6d33BYDexJLnO9mFPnzR5FW53Z o+khDLrTXdrW56wAn3f/HKHgxWH5AfAt94TRWTqYuXAFTrUqQH8oUbOjKqvemqa8Y10F mBem8sRaB6RcDx3rRyMks8ieM9js3hgJnIzCGGztlQFrGst6kzW393eTgK13jF+3ONL3 mm0g== 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=u5ptqmfn; 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 j11-v6si3344805wme.202.2018.10.04.03.42.48; Thu, 04 Oct 2018 03:42:48 -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=u5ptqmfn; 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 0A8CA267844; Thu, 4 Oct 2018 12:42:47 +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 0F8B5267844; Thu, 4 Oct 2018 12:42:44 +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 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 BA5D52678C3 for ; Thu, 4 Oct 2018 12:42:39 +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=nBh6Dt5cpBEmKOCXfH6uRoIrFt2EHMYexCYmFNWeE9E=; b=u5ptqmfnvCxe Vmmh86xzpJx0pMDQs9mFlnvH/xtqxYFlkNqmerR+Gyba+Xq3H0zpTdduHKZuLgrKsGvo8kVdR7bD6 qN2sejAsUVhd1oss4i1TrmpiAR8bdiCfnzEyEQJtUjA5mtT6L5XVR5LMx3wKxZ/M6e7n8EDinizhl TCPsQ=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1g815a-0008Hw-9v; Thu, 04 Oct 2018 10:42:38 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 04D1E1121BA8; Thu, 4 Oct 2018 11:42:38 +0100 (BST) From: Mark Brown To: Dan Carpenter In-Reply-To: <20181001164430.GA29197@mwanda> Message-Id: <20181004104238.04D1E1121BA8@debutante.sirena.org.uk> Date: Thu, 4 Oct 2018 11:42:38 +0100 (BST) Cc: alsa-devel@alsa-project.org, Banajit Goswami , Patrick Lai , kernel-janitors@vger.kernel.org, Takashi Iwai , Liam Girdwood , Vinod Koul , Mark Brown , Srinivas Kandagatla Subject: [alsa-devel] Applied "ASoC: qdsp6: q6asm-dai: checking NULL vs IS_ERR()" 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: q6asm-dai: checking NULL vs IS_ERR() 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 8e9f7265eda9f3a662ca1ca47a69042a7840735b Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 1 Oct 2018 19:44:30 +0300 Subject: [PATCH] ASoC: qdsp6: q6asm-dai: checking NULL vs IS_ERR() The q6asm_audio_client_alloc() doesn't return NULL, it returns error pointers. Fixes: 2a9e92d371db ("ASoC: qdsp6: q6asm: Add q6asm dai driver") Signed-off-by: Dan Carpenter Signed-off-by: Mark Brown --- sound/soc/qcom/qdsp6/q6asm-dai.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.19.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/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index c3806d7037fc..a16c71c03058 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -318,10 +318,11 @@ static int q6asm_dai_open(struct snd_pcm_substream *substream) prtd->audio_client = q6asm_audio_client_alloc(dev, (q6asm_cb)event_handler, prtd, stream_id, LEGACY_PCM_MODE); - if (!prtd->audio_client) { + if (IS_ERR(prtd->audio_client)) { pr_info("%s: Could not allocate memory\n", __func__); + ret = PTR_ERR(prtd->audio_client); kfree(prtd); - return -ENOMEM; + return ret; } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)