summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-aspeed-i2c-ic.c
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-10-11 12:50:23 +0200
committerMarc Zyngier <marc.zyngier@arm.com>2017-10-19 12:22:43 +0200
commit7bdeb7f52b1b193bb50fc6d01c6110ba50bafb5b (patch)
treef51ac6c8e5f86fdeea99582bd3ece222567f451c /drivers/irqchip/irq-aspeed-i2c-ic.c
parentirqchip/meson: Add support for gpio interrupt controller (diff)
downloadlinux-7bdeb7f52b1b193bb50fc6d01c6110ba50bafb5b.tar.xz
linux-7bdeb7f52b1b193bb50fc6d01c6110ba50bafb5b.zip
irqchip/aspeed-i2c-ic: Fix return value check in aspeed_i2c_ic_of_init()
In case of error, the function of_iomap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test.. Reviewed-by: Brendan Higgins <brendanhiggins@google.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/irqchip/irq-aspeed-i2c-ic.c')
-rw-r--r--drivers/irqchip/irq-aspeed-i2c-ic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-aspeed-i2c-ic.c b/drivers/irqchip/irq-aspeed-i2c-ic.c
index 815b88dd18f2..f20200af0992 100644
--- a/drivers/irqchip/irq-aspeed-i2c-ic.c
+++ b/drivers/irqchip/irq-aspeed-i2c-ic.c
@@ -76,8 +76,8 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node,
return -ENOMEM;
i2c_ic->base = of_iomap(node, 0);
- if (IS_ERR(i2c_ic->base)) {
- ret = PTR_ERR(i2c_ic->base);
+ if (!i2c_ic->base) {
+ ret = -ENOMEM;
goto err_free_ic;
}