diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2018-01-02 11:47:19 +0000 |
|---|---|---|
| committer |   Marc Zyngier <marc.zyngier@arm.com> | 2018-01-04 11:13:22 +0000 |
| commit | 404e6bea10662f0e142748353169d25378271e49 (patch) | |
| tree | fe859f0a86fb6c06b2a59a0358ce2e9e3f42d3ab /drivers/irqchip | |
| parent | dt-bindings/bcm283x: Define polarity of per-cpu interrupts (diff) | |
| download | linux-dev-404e6bea10662f0e142748353169d25378271e49.tar.xz linux-dev-404e6bea10662f0e142748353169d25378271e49.zip | |
irqchip/ompic: fix return value check in ompic_of_init()
In case of error, the function ioremap() returns NULL pointer not
ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.
Fixes: 9b54470afd83 ("irqchip: add initial support for ompic")
Acked-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-ompic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-ompic.c b/drivers/irqchip/irq-ompic.c index cf6d0c455518..e66ef4373b1e 100644 --- a/drivers/irqchip/irq-ompic.c +++ b/drivers/irqchip/irq-ompic.c @@ -171,9 +171,9 @@ static int __init ompic_of_init(struct device_node *node, /* Setup the device */ ompic_base = ioremap(res.start, resource_size(&res)); - if (IS_ERR(ompic_base)) { + if (!ompic_base) { pr_err("ompic: unable to map registers"); - return PTR_ERR(ompic_base); + return -ENOMEM; } irq = irq_of_parse_and_map(node, 0); |