path: root/drivers/irqchip
diff options
authorWei Yongjun <weiyongjun1@huawei.com>2018-01-02 11:47:19 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2018-01-04 11:13:22 +0000
commit404e6bea10662f0e142748353169d25378271e49 (patch)
treefe859f0a86fb6c06b2a59a0358ce2e9e3f42d3ab /drivers/irqchip
parentb12f5d0ffcdcd1dc9c732a5be72afdc6a7d627cf (diff)
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')
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);

Privacy Policy