From patchwork Wed May 9 08:36:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10388625 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 D910260353 for ; Wed, 9 May 2018 08:37:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C840A28E24 for ; Wed, 9 May 2018 08:37:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD18A28E29; Wed, 9 May 2018 08:37:35 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 05C1428E24 for ; Wed, 9 May 2018 08:37:35 +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=+2EZZby8qFP3MMKpPQw3TBht7UbwdN5bPUpTE6Tg9gE=; b=KvA Q0g0xvmDqHf9dFtOHEWVBFc/hHnu28Krqur+5Nnv7NMLFwxinbTmiVqRi+FZXT47FRlOxvy2WQstD f+2sTJPPrOF07JpaCw+6wfRSzfdho6grQNC8zDtU0vNcdj69GPeI0Ok0zllWOd3LUjOwkP1YmnYe2 cQkLEdmvr9teaRLOsTygX+6VL5M+rqGGY230FyETseTXjR+y525fJ3JNv2nyzE8tUk9cC0iorgVQX NMDY9TNASap7RgNidmttfX9ZYBc9sJTCFXJ0Je2FxLqYUnw86REWPCDGTwqhXgT0dS7Z8ZTMNSt0D NB4XHPFC64iBniht9ZPeQi3n5JBPYhQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGKbH-00089p-Mo; Wed, 09 May 2018 08:37:27 +0000 Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGKbD-00088Y-En; Wed, 09 May 2018 08:37:25 +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=3GXnPLFkOfhQ+2nlGlppTzKEEOG+kDb7HW0xdKKnTxo=; b=Q/2UBwJSETlT k6DN6yZ7zmkuia0kxvldkzonLyWPxI9/7XwKuDyhwR84F9humxd/K2X2gCKOsZAx5lqr58VJdRfxF 2/VRe8JeAsYsDnLyn1kbTXBijMn9c6we6uxeK/+aV9AzRv+oDSsW9DMP+2s2OAotH0MMfJPGWAdrC vp5X4=; Received: from [2001:268:c0d0:8b7f:9590:ade9:80e5:b26d] (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 1fGKaq-0007f1-17; Wed, 09 May 2018 08:37:00 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id E44CF44007A; Wed, 9 May 2018 09:36:55 +0100 (BST) From: Mark Brown To: Wei Yongjun Subject: Applied "ASoC: fix return value check in mt6351_codec_driver_probe()" to the asoc tree In-Reply-To: <1525657185-73163-1-git-send-email-weiyongjun1@huawei.com> Message-Id: <20180509083655.E44CF44007A@finisterre.ee.mobilebroadband> Date: Wed, 9 May 2018 09:36:55 +0100 (BST) 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-20180509_013723_668641_A1994EE0 X-CRM114-Status: GOOD ( 15.35 ) X-BeenThere: linux-arm-kernel@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, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Takashi Iwai , Liam Girdwood , Mark Brown , linux-mediatek@lists.infradead.org, Matthias Brugger , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org, Kai Chieh Chuang MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: fix return value check in mt6351_codec_driver_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 aaa730ca3f88f535dc12e2f0ff575f70f516841b Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 7 May 2018 01:39:45 +0000 Subject: [PATCH] ASoC: fix return value check in mt6351_codec_driver_probe() In case of error, the function dev_get_regmap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun Signed-off-by: Mark Brown --- sound/soc/codecs/mt6351.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/mt6351.c b/sound/soc/codecs/mt6351.c index e739f078fec5..f73dcd753584 100644 --- a/sound/soc/codecs/mt6351.c +++ b/sound/soc/codecs/mt6351.c @@ -1472,8 +1472,8 @@ static int mt6351_codec_driver_probe(struct platform_device *pdev) priv->dev = &pdev->dev; priv->regmap = dev_get_regmap(pdev->dev.parent, NULL); - if (IS_ERR(priv->regmap)) - return PTR_ERR(priv->regmap); + if (!priv->regmap) + return -ENODEV; dev_dbg(priv->dev, "%s(), dev name %s\n", __func__, dev_name(&pdev->dev));