diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-02-18 09:34:34 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-02-19 08:17:25 +0100 |
| commit | 3900dea4cda7c28d7921370bc4d22b08463ed94c (patch) | |
| tree | 10aac429f40e95fff274cc7a39e5d70a6cfbe9b0 /drivers/irqchip | |
| parent | 5d4bac9a5f4ef24b2482529bda6661a58e5b5b65 (diff) | |
| download | op-kernel-dev-3900dea4cda7c28d7921370bc4d22b08463ed94c.zip op-kernel-dev-3900dea4cda7c28d7921370bc4d22b08463ed94c.tar.gz | |
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@wanadoo.fr>
Cc: marc.zyngier@arm.com
Cc: kernel-janitors@vger.kernel.org
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/20170218083434.2289-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/qcom-irq-combiner.c | 4 |
1 files 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; } |
