From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C0B4C43334 for ; Tue, 28 Jun 2022 02:25:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 68522C341CD; Tue, 28 Jun 2022 02:25:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26ED0C385A2; Tue, 28 Jun 2022 02:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656383117; bh=9VsapHYo2tU4CgPhLYgYIkxQ2l1Fr2KCRwEjZPbMERE=; h=From:To:List-Id:Cc:Subject:Date:In-Reply-To:References:From; b=nBvf8FI+ua1/Oh17fwgNVnxtsIYW7O2Gn3KhpezBFcXX29YWc6oc/ioadnrEn0h4v 171em6tR7lMlTOicALimNMlD4FWS8vDfjxilvb2ExBgMyiK/sOeJVVyd62mMs9x7Cb DkuTU/rlmjGOZ7D/vEzquy4tK6NKlA+q+lXhlj+jP26NtnXT5uGa9PQANu/WYBgaV9 23g7tria1gIbCKUawEY4OHxbE0JV9cwwgSfwaCo6G+gjlINWqEoza4PfWze8Q23zrR KhJs9CMpCpXxiZDDeCh3Ao7iXlKolMHq7rIOr9PHQL3MUTsMzL0HOwWO5QOVsFE0Ud muzrmwvlIWg8A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org List-Id: Cc: Liang He , Viresh Kumar , Arnd Bergmann , Sasha Levin , vireshk@kernel.org, shiraz.linux.kernel@gmail.com, soc@kernel.org, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 27/27] arm: mach-spear: Add missing of_node_put() in time.c Date: Mon, 27 Jun 2022 22:24:13 -0400 Message-Id: <20220628022413.596341-27-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022413.596341-1-sashal@kernel.org> References: <20220628022413.596341-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Liang He [ Upstream commit 2c629dd2d14fd7f64a553f809eda6d0b3a4f615a ] In spear_setup_of_timer(), of_find_matching_node() will return a node pointer with refcount incrementd. We should use of_node_put() in each fail path or when it is not used anymore. Signed-off-by: Liang He Acked-by: Viresh Kumar Link: https://lore.kernel.org/r/20220616093027.3984903-1-windhl@126.com' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/mach-spear/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index 289e036c9c30..6a77ba2c1c50 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -223,13 +223,13 @@ void __init spear_setup_of_timer(void) irq = irq_of_parse_and_map(np, 0); if (!irq) { pr_err("%s: No irq passed for timer via DT\n", __func__); - return; + goto err_put_np; } gpt_base = of_iomap(np, 0); if (!gpt_base) { pr_err("%s: of iomap failed\n", __func__); - return; + goto err_put_np; } gpt_clk = clk_get_sys("gpt0", NULL); @@ -244,6 +244,8 @@ void __init spear_setup_of_timer(void) goto err_prepare_enable_clk; } + of_node_put(np); + spear_clockevent_init(irq); spear_clocksource_init(); @@ -253,4 +255,6 @@ void __init spear_setup_of_timer(void) clk_put(gpt_clk); err_iomap: iounmap(gpt_base); +err_put_np: + of_node_put(np); } -- 2.35.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E27A6C43334 for ; Tue, 28 Jun 2022 02:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cHH9++rWSGRITTq2DyCzKboTdsVch5kEacS8PYIWVXw=; b=EzuDGkwAgZ/tHz BImPdpeAc8xo2+iz6qzfN0AiRdNy5e1CeiUPy7oyypt4OAB54UrF7scxB140hAIduc+o0RwplQReh o0021ykg3vbvC7J7tUwLefQNCyI3nMebZJpURMjdsALdA4qPZC4BpdFeSLaXf+6Lq2XYXigpurQFi pJxRKb1mHjJpQkrrPCrjD9qJmAQTET82ZSsFqJANIMFXUS55MtoCJ3AX3svS/5PhMzeIqL+X0650X VzWF+abRs7sgykdTHiSsSWuQIfR11YdTqDyZwkpfZDBK9C2BgotP0saK6+c8JBEzuyWS8t7Y2LNyl hB2bQAwokiwXndc6OmIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o615i-003o2t-3C; Tue, 28 Jun 2022 02:36:38 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o60um-003i9h-2I for linux-arm-kernel@lists.infradead.org; Tue, 28 Jun 2022 02:25:21 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 89599B81C00; Tue, 28 Jun 2022 02:25:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26ED0C385A2; Tue, 28 Jun 2022 02:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656383117; bh=9VsapHYo2tU4CgPhLYgYIkxQ2l1Fr2KCRwEjZPbMERE=; h=From:To:List-Id:Cc:Subject:Date:In-Reply-To:References:From; b=nBvf8FI+ua1/Oh17fwgNVnxtsIYW7O2Gn3KhpezBFcXX29YWc6oc/ioadnrEn0h4v 171em6tR7lMlTOicALimNMlD4FWS8vDfjxilvb2ExBgMyiK/sOeJVVyd62mMs9x7Cb DkuTU/rlmjGOZ7D/vEzquy4tK6NKlA+q+lXhlj+jP26NtnXT5uGa9PQANu/WYBgaV9 23g7tria1gIbCKUawEY4OHxbE0JV9cwwgSfwaCo6G+gjlINWqEoza4PfWze8Q23zrR KhJs9CMpCpXxiZDDeCh3Ao7iXlKolMHq7rIOr9PHQL3MUTsMzL0HOwWO5QOVsFE0Ud muzrmwvlIWg8A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Liang He , Viresh Kumar , Arnd Bergmann , Sasha Levin , vireshk@kernel.org, shiraz.linux.kernel@gmail.com, soc@kernel.org, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 27/27] arm: mach-spear: Add missing of_node_put() in time.c Date: Mon, 27 Jun 2022 22:24:13 -0400 Message-Id: <20220628022413.596341-27-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022413.596341-1-sashal@kernel.org> References: <20220628022413.596341-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220627_192520_415691_9DAC191F X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Liang He [ Upstream commit 2c629dd2d14fd7f64a553f809eda6d0b3a4f615a ] In spear_setup_of_timer(), of_find_matching_node() will return a node pointer with refcount incrementd. We should use of_node_put() in each fail path or when it is not used anymore. Signed-off-by: Liang He Acked-by: Viresh Kumar Link: https://lore.kernel.org/r/20220616093027.3984903-1-windhl@126.com' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/mach-spear/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index 289e036c9c30..6a77ba2c1c50 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -223,13 +223,13 @@ void __init spear_setup_of_timer(void) irq = irq_of_parse_and_map(np, 0); if (!irq) { pr_err("%s: No irq passed for timer via DT\n", __func__); - return; + goto err_put_np; } gpt_base = of_iomap(np, 0); if (!gpt_base) { pr_err("%s: of iomap failed\n", __func__); - return; + goto err_put_np; } gpt_clk = clk_get_sys("gpt0", NULL); @@ -244,6 +244,8 @@ void __init spear_setup_of_timer(void) goto err_prepare_enable_clk; } + of_node_put(np); + spear_clockevent_init(irq); spear_clocksource_init(); @@ -253,4 +255,6 @@ void __init spear_setup_of_timer(void) clk_put(gpt_clk); err_iomap: iounmap(gpt_base); +err_put_np: + of_node_put(np); } -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel