From patchwork Wed Jul 30 00:04:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiyj_lk@163.com X-Patchwork-Id: 4643761 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3D67F9F2B8 for ; Wed, 30 Jul 2014 00:04:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62E2C20145 for ; Wed, 30 Jul 2014 00:04:46 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D783720125 for ; Wed, 30 Jul 2014 00:04:44 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 33A542654B2; Wed, 30 Jul 2014 02:04:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id EBF602654A6; Wed, 30 Jul 2014 02:04:31 +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 1E1602654A6; Wed, 30 Jul 2014 02:04:27 +0200 (CEST) Received: from m12-18.163.com (m12-18.163.com [220.181.12.18]) by alsa0.perex.cz (Postfix) with ESMTP id D057426549D for ; Wed, 30 Jul 2014 02:04:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=O/uFY3I6xqtZoEfhgS Npao0QeB9o8oQL3AZSfNDxhcA=; b=FdQ8t62PGWXUqFaZ4ZY4rCJcVg6MB7DQ9o BGsqjJx8nZr91Rtn66pzVLUMsRonRk+6T+EM4JhV/YuKPeDhq/cwA1PXambPwDT3 Cp1d2eATRse5CkrzGXclM3snPaOlf6t1bT1lPRGAyJYghAuRqN1uIzo/KO/TqXGq 3pvtit4fw= Received: from localhost.localdomain.localdomain (unknown [180.110.163.205]) by smtp14 (Coremail) with SMTP id EsCowEBZJFt9NthTw1F1Cg--.5693S2; Wed, 30 Jul 2014 08:04:14 +0800 (CST) X-Coremail-DSSMTP: 180.110.163.205 From: weiyj_lk@163.com To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Barry Song , Grant Likely , Rob Herring , Rongjun Ying , Lars-Peter Clausen , Axel Lin Date: Wed, 30 Jul 2014 08:04:12 +0800 Message-Id: <1406678652-31950-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 1.9.3 X-CM-TRANSID: EsCowEBZJFt9NthTw1F1Cg--.5693S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kAFWDXryfuF1furWxJFb_yoWDZFX_Ja yruFZ7XFs2qF42yrZrZrWYyF4fX3Z3Cr9Ivr13KFy7J34UGw1Y9ryUCr1xCr4xu39akFy5 GFnxZr42yw17CjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU5Q6pPUUUUU== X-Originating-IP: [180.110.163.205] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/xtbByhTX1lO+W6f9IQABsT Cc: Wei Yongjun , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH] ASoC: sirf-audio-codec: Fix return value check in sirf_audio_codec_driver_probe() 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 X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun --- sound/soc/codecs/sirf-audio-codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c index d90cb0f..06ba492 100644 --- a/sound/soc/codecs/sirf-audio-codec.c +++ b/sound/soc/codecs/sirf-audio-codec.c @@ -471,8 +471,8 @@ static int sirf_audio_codec_driver_probe(struct platform_device *pdev) mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); base = devm_ioremap_resource(&pdev->dev, mem_res); - if (base == NULL) - return -ENOMEM; + if (IS_ERR(base)) + return PTR_ERR(base); sirf_audio_codec->regmap = devm_regmap_init_mmio(&pdev->dev, base, &sirf_audio_codec_regmap_config);