From nobody Sat Feb 7 07:37:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A1D4C43217 for ; Sat, 26 Nov 2022 13:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229529AbiKZNee (ORCPT ); Sat, 26 Nov 2022 08:34:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbiKZNec (ORCPT ); Sat, 26 Nov 2022 08:34:32 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08B751902C for ; Sat, 26 Nov 2022 05:34:31 -0800 (PST) Date: Sat, 26 Nov 2022 13:34:26 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669469668; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SmCYCGm0BvBvyxk+DEsBy+/4EqgLZrxk2j9sfi/hvfE=; b=UzfQBnYhZugsSNFGv4d2pyxJo+4c36wdtIv3Ow97wSopEu9aJVS1j5eQwEW8Vj34QAR+Kv PvylmQb3QXfTaoIExLYGbEEBhUWKcDgTR6++k8YvS0gEPyuDRPxQOesWtgRuYTp0N+IM9P sP7M9ZSd/mVW19gIojr9w3xMCBvhWnp5VUImGwZhZN+tNQwZigw/yPXMGJ42v+bvEEA9IL DHehWiWncOvtCQyIgPbDeVgkpDULxqDMiRqPSvwKhbe+f8jthbPxgAE+3p1KveSXhEK/bl ls/KKOnAa3fSBSIfstmhWU7p9EtkXQ3B4dzFFrtLqyqniTAdX72la3EXea1a7Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669469668; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SmCYCGm0BvBvyxk+DEsBy+/4EqgLZrxk2j9sfi/hvfE=; b=q02x4p5k9tq5hDeBGsIAa+xR+9wDaNrIe74KomOqUIP/tM9fLir/FYdqMy70FMWI796ANT UDXNz0ilNNmMaLBA== From: "irqchip-bot for Liu Peibao" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-kernel@vger.kernel.org Subject: [irqchip: irq/irqchip-next] irqchip/loongson-liointc: Fix improper error handling in liointc_init() Cc: Liu Peibao , Marc Zyngier , tglx@linutronix.de In-Reply-To: <20221104110712.23300-1-liupeibao@loongson.cn> References: <20221104110712.23300-1-liupeibao@loongson.cn> MIME-Version: 1.0 Message-ID: <166946966692.4906.8560659273979544805.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/irqchip-next branch of ir= qchip: Commit-ID: 4a60a3cdcf1875c965095eb9e22c3d12bbc5a53d Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-plat= forms/4a60a3cdcf1875c965095eb9e22c3d12bbc5a53d Author: Liu Peibao AuthorDate: Fri, 04 Nov 2022 19:07:12 +08:00 Committer: Marc Zyngier CommitterDate: Sat, 26 Nov 2022 13:29:57=20 irqchip/loongson-liointc: Fix improper error handling in liointc_init() For cores less than 4, eg, loongson2k1000 with 2 cores, the of_property_match_string() may return with an error value, which causes that liointc could not work. At least isr0 is what should be checked like previous commit b2c4c3969fd7 ("irqchip/loongson-liointc: irqchip add 2.0 version") did. Fixes: 0858ed035a85 ("irqchip/loongson-liointc: Add ACPI init support") Signed-off-by: Liu Peibao Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20221104110712.23300-1-liupeibao@loongson.cn --- drivers/irqchip/irq-loongson-liointc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-l= oongson-liointc.c index 0da8716..c4584e2 100644 --- a/drivers/irqchip/irq-loongson-liointc.c +++ b/drivers/irqchip/irq-loongson-liointc.c @@ -207,10 +207,13 @@ static int liointc_init(phys_addr_t addr, unsigned lo= ng size, int revision, "reg-names", core_reg_names[i]); =20 if (index < 0) - goto out_iounmap; + continue; =20 priv->core_isr[i] =3D of_iomap(node, index); } + + if (!priv->core_isr[0]) + goto out_iounmap; } =20 /* Setup IRQ domain */