diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-05-02 17:03:26 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-05 10:45:59 +0200 |
| commit | dbf07cf0c846c3a0d3f97976931cb4ae78f730e2 (patch) | |
| tree | fee81b19210fd043c6ba34c79c279aa7cadf8c0a /drivers/irqchip/irq-vf610-mscm-ir.c | |
| parent | irqchip: irqc: Remove platform data support (diff) | |
| download | linux-dbf07cf0c846c3a0d3f97976931cb4ae78f730e2.tar.xz linux-dbf07cf0c846c3a0d3f97976931cb4ae78f730e2.zip | |
irqchip: vf610: Fix of_io_request_and_map error check
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 <maxime.ripard@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1430579006-32702-7-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-vf610-mscm-ir.c')
| -rw-r--r-- | drivers/irqchip/irq-vf610-mscm-ir.c | 5 |
1 files 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; } |