From patchwork Fri Sep 21 06:32:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1489751 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 4A5F2DF28C for ; Fri, 21 Sep 2012 06:33:51 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEwmY-0003Jr-HT; Fri, 21 Sep 2012 06:32:11 +0000 Received: from mail-qc0-f177.google.com ([209.85.216.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEwmT-0003Hj-67 for linux-arm-kernel@lists.infradead.org; Fri, 21 Sep 2012 06:32:06 +0000 Received: by qcsu28 with SMTP id u28so2528553qcs.36 for ; Thu, 20 Sep 2012 23:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=Pe7XV+qZsPWsCW1TdBRTxKdj7jgryJ7efnlG61OkcHo=; b=l8qD0RE83SZ3WlIcleJmLeeT0eKQl+VhWHORuDAiJBPbRRUobTBVg0PHLjPnevVetK Zg/t/TxWgyEgtQPkBuY5ZW2+e7knSPA1oKPdQTVSu8C7EMFCfLEKVY3Q92A51js+BZpf /RmHAcnv4/2Mv95MpPMNj2j35kcMSP6Urxk8y3fRqC1LxTcp9QPDV9jOqpAZpZ3aLMke Aatb5+ZAgdoicSM2kIEE5/zbm4vGsimRCkNeUXZgysHg4CL0w0QzV6i2UMx1Q3/crkjm ejIk2VJOCjuWn9p39HhOM/sB3Chvw2OnyyfGgL0b1DwwTCO7EsssAfzrStU3yOseTlbJ /+0g== MIME-Version: 1.0 Received: by 10.229.136.200 with SMTP id s8mr2755795qct.46.1348209124377; Thu, 20 Sep 2012 23:32:04 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Thu, 20 Sep 2012 23:32:04 -0700 (PDT) Date: Fri, 21 Sep 2012 14:32:04 +0800 Message-ID: Subject: [PATCH] ARM: OMAP: omap_device: fix return value check in omap_device_build_ss() From: Wei Yongjun To: tony@atomide.com, linux@arm.linux.org.uk, grant.likely@secretlab.ca, rob.herring@calxeda.com X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (weiyj.lk[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: yongjun_wei@trendmicro.com.cn, linux-omap@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Wei Yongjun In case of error, the function omap_device_alloc() returns ERR_PTR() and never returns NULL pointer. The NULL test in the return value check should be replaced with IS_ERR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun Acked-by: Kevin Hilman --- arch/arm/plat-omap/omap_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index c490240..3f62de6 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -671,7 +671,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p dev_set_name(&pdev->dev, "%s", pdev->name); od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt); - if (!od) + if (IS_ERR(od)) goto odbs_exit1; ret = platform_device_add_data(pdev, pdata, pdata_len);