Commit-ID: 569293c9ca9c5b9b5f7fa3c314ffceafc62957a8
Gitweb: http://git.kernel.org/tip/569293c9ca9c5b9b5f7fa3c314ffceafc62957a8
Author: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
AuthorDate: Sat, 18 Feb 2017 09:34:34 +0100
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Sat, 18 Feb 2017 10:19:07 +0100
irqchip/qcom: Fix error handling
'devm_ioremap()' returns NULL on error, not an error pointer.
Fixes: f20cc9b00c7b ("irqchip/qcom: Add IRQ combiner driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Cc: marc.zyngier@xxxxxxx
Cc: kernel-janitors@xxxxxxxxxxxxxxx
Cc: jason@xxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/20170218083434.2289-1-christophe.jaillet@xxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
drivers/irqchip/qcom-irq-combiner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/qcom-irq-combiner.c b/drivers/irqchip/qcom-irq-combiner.c
index 03251da..2265586 100644
--- a/drivers/irqchip/qcom-irq-combiner.c
+++ b/drivers/irqchip/qcom-irq-combiner.c
@@ -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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|