linux-kernel - [PATCH -next] ARM: mmp: Add missing clk_disable_unprepare() in mmp_dt_init

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220907061454.3800923-1-chenlifu@huawei.com>
Date:   Wed, 7 Sep 2022 14:14:54 +0800
From:   Chen Lifu <chenlifu@...wei.com>
To:     <lkundrak@...sk>, <linux@...linux.org.uk>, <olof@...om.net>,
        <pavel@....cz>, <linux-arm-kernel@...ts.infradead.org>,
        <linux-kernel@...r.kernel.org>
CC:     <chenlifu@...wei.com>
Subject: [PATCH -next] ARM: mmp: Add missing clk_disable_unprepare() in mmp_dt_init_timer()

mmp_dt_init_timer() may have called clk_prepare_enable() before return
from failed branches, add missing clk_disable_unprepare() in these cases.

Fixes: f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock")
Signed-off-by: Chen Lifu <chenlifu@...wei.com>
---
 arch/arm/mach-mmp/time.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index 41b2e8abc9e6..6d2db1fea1be 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -207,16 +207,20 @@ static int __init mmp_dt_init_timer(struct device_node *np)
 	} else {
 		rate = 3250000;
 	}
 
 	irq = irq_of_parse_and_map(np, 0);
-	if (!irq)
+	if (!irq) {
+		clk_disable_unprepare(clk);
 		return -EINVAL;
+	}
 
 	mmp_timer_base = of_iomap(np, 0);
-	if (!mmp_timer_base)
+	if (!mmp_timer_base) {
+		clk_disable_unprepare(clk);
 		return -ENOMEM;
+	}
 
 	mmp_timer_init(irq, rate);
 	return 0;
 }
 
-- 
2.37.1