From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752912AbdBRJXI (ORCPT ); Sat, 18 Feb 2017 04:23:08 -0500 Received: from terminus.zytor.com ([65.50.211.136]:58480 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822AbdBRJXF (ORCPT ); Sat, 18 Feb 2017 04:23:05 -0500 Date: Sat, 18 Feb 2017 01:22:54 -0800 From: tip-bot for Christophe JAILLET Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, christophe.jaillet@wanadoo.fr, mingo@kernel.org, hpa@zytor.com Reply-To: hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, christophe.jaillet@wanadoo.fr, tglx@linutronix.de In-Reply-To: <20170218083434.2289-1-christophe.jaillet@wanadoo.fr> References: <20170218083434.2289-1-christophe.jaillet@wanadoo.fr> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/qcom: Fix error handling Git-Commit-ID: 569293c9ca9c5b9b5f7fa3c314ffceafc62957a8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 569293c9ca9c5b9b5f7fa3c314ffceafc62957a8 Gitweb: http://git.kernel.org/tip/569293c9ca9c5b9b5f7fa3c314ffceafc62957a8 Author: Christophe JAILLET AuthorDate: Sat, 18 Feb 2017 09:34:34 +0100 Committer: Thomas Gleixner 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 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 --- 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; }