From patchwork Thu Sep 11 23:12:14 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: 388433 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0CDB01400EA for ; Fri, 12 Sep 2014 09:12:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752490AbaIKXMc (ORCPT ); Thu, 11 Sep 2014 19:12:32 -0400 Received: from m12-15.163.com ([220.181.12.15]:58419 "EHLO m12-15.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751215AbaIKXMb (ORCPT ); Thu, 11 Sep 2014 19:12:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=3C6fGEyBA7DGhcpDUw cCcKkBgQ3HYckQSnY5wZe9p+4=; b=CYFqcIH194fLMOjUK33KtfuZUdMgB0AGs8 cGN2IegqLEIkALJhv7YgGe3DtHheYMNml5O+UBAd8nrBO9bR9dlmnugDbPdSRaMV JOGoQLImhOIiZbw3eur1DHlIwZdKfzpDiIsjbSxi9UhjWU7KBpGdt1aVtA8W4Oa3 5oCpq5QkQ= Received: from localhost.localdomain.localdomain (unknown [117.88.88.12]) by smtp11 (Coremail) with SMTP id D8CowEDJ4UlPLBJUNgSoAA--.987S2; Fri, 12 Sep 2014 07:12:16 +0800 (CST) X-Coremail-DSSMTP: 117.88.88.12 From: weiyj_lk@163.com To: Linus Walleij , Alexandre Courbot , Grant Likely , Rob Herring Cc: Wei Yongjun , linux-gpio@vger.kernel.org Subject: [PATCH -next] gpio: Fix return value check in xgene_gpio_probe() Date: Fri, 12 Sep 2014 07:12:14 +0800 Message-Id: <1410477134-5556-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 1.9.3 X-CM-TRANSID: D8CowEDJ4UlPLBJUNgSoAA--.987S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7WryUXryrJr1xWry5Ww1rWFg_yoWfAwc_C3 ykursrJr90vF1qgF47Cr13Ar9avF1v9rn5Zr1kKay3J34qvw1UGr9xZrn8Ar18Xws8KFyq ywnrZr12vr4fCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUns0ePUUUUU== X-Originating-IP: [117.88.88.12] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiRxEE1lD+VsgQowAAsH Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Wei Yongjun In case of error, the function devm_ioremap_nocache() 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 Reviewed-by: Alexandre Courbot --- drivers/gpio/gpio-xgene.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c index e25ba14..cf751f5 100644 --- a/drivers/gpio/gpio-xgene.c +++ b/drivers/gpio/gpio-xgene.c @@ -182,8 +182,8 @@ static int xgene_gpio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); gpio->base = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res)); - if (IS_ERR(gpio->base)) { - err = PTR_ERR(gpio->base); + if (!gpio->base) { + err = -ENOMEM; goto err; }