From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761AbbEBPFx (ORCPT ); Sat, 2 May 2015 11:05:53 -0400 Received: from down.free-electrons.com ([37.187.137.238]:33243 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752472AbbEBPFI (ORCPT ); Sat, 2 May 2015 11:05:08 -0400 From: Maxime Ripard To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Jason Cooper , Thomas Gleixner Subject: [PATCH 6/6] irqchip: vf610: Fix of_io_request_and_map error check Date: Sat, 2 May 2015 17:03:26 +0200 Message-Id: <1430579006-32702-7-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.3.6 In-Reply-To: <1430579006-32702-1-git-send-email-maxime.ripard@free-electrons.com> References: <1430579006-32702-1-git-send-email-maxime.ripard@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org of_io_request_and map returns an error pointer, but the current code assumes that on error the returned pointer will be NULL. Obviously, that makes the check completely useless. Change the test to actually check for the proper error code. Signed-off-by: Maxime Ripard Cc: Jason Cooper Cc: Thomas Gleixner --- drivers/irqchip/irq-vf610-mscm-ir.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-vf610-mscm-ir.c b/drivers/irqchip/irq-vf610-mscm-ir.c index 9521057d4744..d0f940a3516d 100644 --- a/drivers/irqchip/irq-vf610-mscm-ir.c +++ b/drivers/irqchip/irq-vf610-mscm-ir.c @@ -174,10 +174,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node, return -ENOMEM; mscm_ir_data->mscm_ir_base = of_io_request_and_map(node, 0, "mscm-ir"); - - if (!mscm_ir_data->mscm_ir_base) { + if (IS_ERR(mscm_ir_data->mscm_ir_base)) { pr_err("vf610_mscm_ir: unable to map mscm register\n"); - ret = -ENOMEM; + ret = PTR_ERR(mscm_ir_data->mscm_ir_base); goto out_free; } -- 2.3.6