From patchwork Fri Sep 21 06:30:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1489741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 7FB8D3FCFC for ; Fri, 21 Sep 2012 06:32:42 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEwlL-0002kS-Vq; Fri, 21 Sep 2012 06:30:56 +0000 Received: from mail-qa0-f49.google.com ([209.85.216.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEwlH-0002ih-7n for linux-arm-kernel@lists.infradead.org; Fri, 21 Sep 2012 06:30:51 +0000 Received: by qafk1 with SMTP id k1so996593qaf.15 for ; Thu, 20 Sep 2012 23:30:50 -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=LdDS7F63XcWUVaHGr9vkdlnnMPZsBvg4ML/KKFkJtOc=; b=c2bSvX9YsDRpgM2j5T7c+8LB1BDFDggCWoso/rs56LJuzXd84nZ07ebSsEG3QSx9pm i3nDimy8sRLExO9AVtxD39HSmJLH8ZMZvFuGKne2TLI4pH/T2XFuHOQoDd48iW8zg+Y2 2PY4f3T4ibfNf3Bl/obyJQB5lio3WqMi6c7oN1T2bg3kToXRYSbXLFoMJHlhgcaKuMot xiDV1feNVtVS4csBin6cxYeAzgSgbjbIcEv8IrhATlNvrgkg0NroWgqCeij0/6quuaOL qBhEN9GBrqNp6T/krwyxiwS7n+xjjth3rU7vGH5v+o6rNsI3JlPXsNOTkMFudVoxX0yB NPug== MIME-Version: 1.0 Received: by 10.224.100.200 with SMTP id z8mr10041271qan.75.1348209050167; Thu, 20 Sep 2012 23:30:50 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Thu, 20 Sep 2012 23:30:50 -0700 (PDT) Date: Fri, 21 Sep 2012 14:30:50 +0800 Message-ID: Subject: [PATCH] ARM: OMAP: hsmmc: fix return value check in omap_hsmmc_init_one() From: Wei Yongjun To: tony@atomide.com, linux@arm.linux.org.uk 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.49 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, 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() not 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 --- arch/arm/mach-omap2/hsmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index a9675d8..95179fe 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -522,7 +522,7 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id); od = omap_device_alloc(pdev, ohs, 1, NULL, 0); - if (!od) { + if (IS_ERR(od)) { pr_err("Could not allocate od for %s\n", name); goto put_pdev; }