From patchwork Mon Jan 8 12:35:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10149351 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 61BAB601A1 for ; Mon, 8 Jan 2018 12:37:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 474622852A for ; Mon, 8 Jan 2018 12:37:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BD5828575; Mon, 8 Jan 2018 12:37:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DDD0B2852A for ; Mon, 8 Jan 2018 12:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=ATOYjFN6FCvh2nMicMJ744d+p73a4JGti90K6dATgrs=; b=DUP c7LLWG/l6LCNTwiUcJrTzY8RZvXRKOf0GypEBG1V2VHBZc6GfHe+qCMWij8j57gnvQI8haqFTy847 JBfvufeo/nkoXHrkRVGwvFzeqtF+dJlClIiMgpBK6HRzNUS6urERhS7BmyNkKb/K3qKkKiurPdK2Y DMFfzQYf5SSYI+MKc3GPskR19VKYyvrv2ltc1LqTBxcgQlC8BVQqV1EFRRbYaL/1cisCCvJHA98QQ KcHBO0SJStjZMcWaX0jbbP67FWAWEUemp/mq0cR57cweKiOSK/UzlhdQeeA5IDEpnfAvIn0S0hm1/ yN6EFVHu7s9G9TB00ikwiGTaLjwoOEg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eYWfv-0002HS-Hn; Mon, 08 Jan 2018 12:37:11 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYWfs-0002DG-3E; Mon, 08 Jan 2018 12:37:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=+8gz+CLmQtOVKgtJ00SWVzwkavX3LCuvtx6Wbh+6QqU=; b=ooN4G472SGwpDKl7ax5L8zYYHG IHTm5YLd7hHd1mXicGSEcWheMfEmV+qWS3edIqMX1UgnMEdSDydHwHQ2y8F3URVD82EjPcBjzBa9p Y6Khije9R/VimN+VhIh7Cd9jsaThbC/xV9lEedvZ+VMbUQCKZgM6E5wdo/CqCAnF7cV5rBX7NYPac FbirrOgitYC259ZVHt8cPjc8EwOG6DcHn+JwUNEE++t8CifPbTlGZuK9OP3547pKBJW/Pyf4KG2TY xFOxOMYK0aFxAPgnl1T3qA/jSgZu6DWuNmp+b4sb5Hn+cxshiJPyxYZq85E9A9UZkBvTuNDfH+KCV xj7KUupQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYWfo-00039R-Oh; Mon, 08 Jan 2018 12:37:06 +0000 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=+8gz+CLmQtOVKgtJ00SWVzwkavX3LCuvtx6Wbh+6QqU=; b=AnJzMPTk9/DN dGg0yjHF6QnLTTmD2nCB1r+AHdOs7Pv9z+U2sgWWPXjHC+GWXsfYBDLvWLxRf1lL7WRG4icegH33O s/xTwCb3pGuz1ZH+VhwyBooq1OKI3HfE8xwHkrGQAsXaqE0p33QLI33kyFuJKPl+nElrRT2v04Siq CsS78=; 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 1eYWeN-0001xb-Sj; Mon, 08 Jan 2018 12:35:35 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1eYWeN-0003J4-DW; Mon, 08 Jan 2018 12:35:35 +0000 From: Mark Brown To: Wei Yongjun Subject: Applied "ASoC: mediatek: mt2701: fix return value check in mt2701_afe_pcm_dev_probe()" to the asoc tree In-Reply-To: <1515377701-37553-1-git-send-email-weiyongjun1@huawei.com> Message-Id: Date: Mon, 08 Jan 2018 12:35:35 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180108_123704_821566_F665A63C X-CRM114-Status: GOOD ( 20.79 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Ryder Lee , linux-kernel@vger.kernel.org, Garlic Tseng , Takashi Iwai , Liam Girdwood , Mark Brown , "Gustavo A. R. Silva" , Brugger , linux-mediatek@lists.infradead.org, Matthias@sirena.org.uk, Jaroslav Kysela , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: mediatek: mt2701: fix return value check in mt2701_afe_pcm_dev_probe() 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 3e8052d90d24320a1edb556c20523f3b17195985 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 8 Jan 2018 02:15:01 +0000 Subject: [PATCH] ASoC: mediatek: mt2701: fix return value check in mt2701_afe_pcm_dev_probe() In case of error, the function syscon_node_to_regmap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: dfa3cbb83e09 ("ASoC: mediatek: modify MT2701 AFE driver to adapt mfd device") Signed-off-by: Wei Yongjun Signed-off-by: Mark Brown --- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c index f0cd08fa5c5d..5bc4e00a4a29 100644 --- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c +++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c @@ -1440,9 +1440,9 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) } afe->regmap = syscon_node_to_regmap(dev->parent->of_node); - if (!afe->regmap) { + if (IS_ERR(afe->regmap)) { dev_err(dev, "could not get regmap from parent\n"); - return -ENODEV; + return PTR_ERR(afe->regmap); } mutex_init(&afe->irq_alloc_lock);