From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E377FC43387 for ; Mon, 17 Dec 2018 11:50:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3B23206A2 for ; Mon, 17 Dec 2018 11:50:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732473AbeLQLuq (ORCPT ); Mon, 17 Dec 2018 06:50:46 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:52234 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726831AbeLQLuq (ORCPT ); Mon, 17 Dec 2018 06:50:46 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 6E691D59C4BC5; Mon, 17 Dec 2018 19:50:43 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.408.0; Mon, 17 Dec 2018 19:50:38 +0800 From: Wei Yongjun To: Thomas Gleixner , Jason Cooper , Marc Zyngier , Manivannan Sadhasivam CC: Wei Yongjun , , Subject: [PATCH -next] irqchip: irq-rda-intc: Fix return value check in rda8810_intc_init() Date: Mon, 17 Dec 2018 11:58:18 +0000 Message-ID: <1545047898-153890-1-git-send-email-weiyongjun1@huawei.com> X-Mailer: git-send-email 1.8.3.1 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case of error, the function of_io_request_and_map() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: d852e62ad689 ("irqchip: Add RDA8810PL interrupt driver") Signed-off-by: Wei Yongjun --- drivers/irqchip/irq-rda-intc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-rda-intc.c b/drivers/irqchip/irq-rda-intc.c index 1176291..9601683 100644 --- a/drivers/irqchip/irq-rda-intc.c +++ b/drivers/irqchip/irq-rda-intc.c @@ -85,8 +85,8 @@ static int __init rda8810_intc_init(struct device_node *node, struct device_node *parent) { rda_intc_base = of_io_request_and_map(node, 0, "rda-intc"); - if (!rda_intc_base) - return -ENXIO; + if (IS_ERR(rda_intc_base)) + return PTR_ERR(rda_intc_base); /* Mask all interrupt sources */ writel_relaxed(RDA_IRQ_MASK_ALL, rda_intc_base + RDA_INTC_MASK_CLR);