This is a note to let you know that I've just added the patch titled irqchip/ompic: fix return value check in ompic_of_init() to the 4.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: irqchip-ompic-fix-return-value-check-in-ompic_of_init.patch and it can be found in the queue-4.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Mon Apr 9 10:16:32 CEST 2018 From: Wei Yongjun <weiyongjun1@xxxxxxxxxx> Date: Tue, 2 Jan 2018 11:47:19 +0000 Subject: irqchip/ompic: fix return value check in ompic_of_init() From: Wei Yongjun <weiyongjun1@xxxxxxxxxx> [ Upstream commit 404e6bea10662f0e142748353169d25378271e49 ] In case of error, the function ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 9b54470afd83 ("irqchip: add initial support for ompic") Acked-by: Stafford Horne <shorne@xxxxxxxxx> Signed-off-by: Wei Yongjun <weiyongjun1@xxxxxxxxxx> Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/irqchip/irq-ompic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/irqchip/irq-ompic.c +++ b/drivers/irqchip/irq-ompic.c @@ -171,9 +171,9 @@ static int __init ompic_of_init(struct d /* Setup the device */ ompic_base = ioremap(res.start, resource_size(&res)); - if (IS_ERR(ompic_base)) { + if (!ompic_base) { pr_err("ompic: unable to map registers"); - return PTR_ERR(ompic_base); + return -ENOMEM; } irq = irq_of_parse_and_map(node, 0); Patches currently in stable-queue which might be from weiyongjun1@xxxxxxxxxx are queue-4.15/gpio-thunderx-fix-error-return-code-in-thunderx_gpio_probe.patch queue-4.15/irqchip-ompic-fix-return-value-check-in-ompic_of_init.patch