From patchwork Sat Feb 6 14:56:36 2016 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: 579840 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 6CC4014032B for ; Sun, 7 Feb 2016 01:58:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=UDEnp+nv; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750888AbcBFO6F (ORCPT ); Sat, 6 Feb 2016 09:58:05 -0500 Received: from m12-15.163.com ([220.181.12.15]:51750 "EHLO m12-15.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbcBFO6E (ORCPT ); Sat, 6 Feb 2016 09:58:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=bm4+l E/6hnEwRihc79qZTZhqpwnrWqaQTAzgT+xfhzI=; b=UDEnp+nvMBUWDZqSn65Nl TuvTfNAt3bMisMgqGPIZhF90W1bFYH6PvFHg8+p5SxDj3wdeOxicOJOSKltQayj2 +qxznEC6dNSZkMR0B17kxt75SWGq2oKziAOyMSOiUbD5Ni7b4xGdr8O3WBsOwDmo h/46o/NbJu+CMFBkRp3yeU= Received: from localhost.localdomain.localdomain (unknown [49.77.206.103]) by smtp11 (Coremail) with SMTP id D8CowECpvEKpCbZWk0UXAA--.6493S2; Sat, 06 Feb 2016 22:56:42 +0800 (CST) From: weiyj_lk@163.com To: Linus Walleij Cc: Wei Yongjun , linux-gpio@vger.kernel.org Subject: [PATCH] pinctrl: Fix return value check in amd_gpio_probe() Date: Sat, 6 Feb 2016 22:56:36 +0800 Message-Id: <1454770596-11299-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.4.3 MIME-Version: 1.0 X-CM-TRANSID: D8CowECpvEKpCbZWk0UXAA--.6493S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7WryUXryrJr4kKFy3Ar15CFg_yoWfuFgEka 98ury7Xry8Kr1jqrW7tr13Za4akF4DWF4vqFn3ta43C34UJw4xtrykurn8Cw1fWwsIkry5 AryDZr1fAr1fCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU02Q6JUUUUU== X-Originating-IP: [49.77.206.103] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/xtbBygwH1lO+hnRlcQAAsc 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 --- drivers/pinctrl/pinctrl-amd.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/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index 6574494..5c025f5 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c @@ -753,8 +753,8 @@ static int amd_gpio_probe(struct platform_device *pdev) gpio_dev->base = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res)); - if (IS_ERR(gpio_dev->base)) - return PTR_ERR(gpio_dev->base); + if (!gpio_dev->base) + return -ENOMEM; irq_base = platform_get_irq(pdev, 0); if (irq_base < 0) {