irqchip/qcom: Fix error handling
authorChristophe JAILLET <[email protected]>
Sat, 18 Feb 2017 08:34:34 +0000 (09:34 +0100)
committerThomas Gleixner <[email protected]>
Sun, 19 Feb 2017 07:17:25 +0000 (08:17 +0100)
'devm_ioremap()' returns NULL on error, not an error pointer.

Fixes: f20cc9b00c7b ("irqchip/qcom: Add IRQ combiner driver")
Signed-off-by: Christophe JAILLET <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
drivers/irqchip/qcom-irq-combiner.c

index 03251da95397d3029c6f82e6f65e8038f8553198..22655869834435900773448735d3b1403aca4b66 100644 (file)
@@ -202,9 +202,9 @@ static acpi_status get_registers_cb(struct acpi_resource *ares, void *context)
        }
 
        vaddr = devm_ioremap(ctx->dev, reg->address, REG_SIZE);
-       if (IS_ERR(vaddr)) {
+       if (!vaddr) {
                dev_err(ctx->dev, "Can't map register @%pa\n", &paddr);
-               ctx->err = PTR_ERR(vaddr);
+               ctx->err = -ENOMEM;
                return AE_ERROR;
        }