From nobody Thu Sep 18 05:40:33 2025 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 E0A9CC4332F for ; Fri, 9 Dec 2022 15:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230363AbiLIPro (ORCPT ); Fri, 9 Dec 2022 10:47:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230216AbiLIPrZ (ORCPT ); Fri, 9 Dec 2022 10:47:25 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 633EF379FE; Fri, 9 Dec 2022 07:47:24 -0800 (PST) Date: Fri, 09 Dec 2022 15:47:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670600842; 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=ptf5JucJI9u3RmOJs1YiPXVOdJFaBXojrhh5idR/RN4=; b=bNfTGrjGpgkCApaF4NH9BaFg3su2rFHipR6iohAGgm6UmH+BRGk/aY1huwkRLnZRqWDhug TFy+Zgt7vf7bSL2eIiypFh7+QN/v1nDxKydYeVmrGBCXcivUbsFUkG/99sxsT9VeDU2kWJ Qy82GwznWCHzaiUtZ4IW/GY+TkQ5ZMXT5CEc++x0cJqxIvpnW6oqbAaRNybD1gq83FGKyB ZsUAnu0Cz2ZfBflDJvhRQVuZQ/PUYHgCUguq7Y7EMCR4FXE0cntgotzjxzwMwUt4yO14PQ r6ds4EjuIN+/wwMkeoJtNCol7Mi+juO4auY17+zY0+mkuhERnbyVW0ZAZagJcA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670600842; 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=ptf5JucJI9u3RmOJs1YiPXVOdJFaBXojrhh5idR/RN4=; b=/Iq8f1Ok6sfvVh3kkkkI7Bl+kwkHWdVqzy/rta3ImM9ka5FTp0vlqcanrWHr+N1kRC5rsU UfH1J7Xnt+k7BGAA== From: "tip-bot2 for Yang Yingliang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/timer-ti-dm: Fix missing clk_disable_unprepare in dmtimer_systimer_init_clock() Cc: Yang Yingliang , Tony Lindgren , Daniel Lezcano , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221029114427.946520-1-yangyingliang@huawei.com> References: <20221029114427.946520-1-yangyingliang@huawei.com> MIME-Version: 1.0 Message-ID: <167060084258.4906.16638898488037471774.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 timers/core branch of tip: Commit-ID: 180d35a7c05d520314a590c99ad8643d0213f28b Gitweb: https://git.kernel.org/tip/180d35a7c05d520314a590c99ad8643d0= 213f28b Author: Yang Yingliang AuthorDate: Sat, 29 Oct 2022 19:44:27 +08:00 Committer: Daniel Lezcano CommitterDate: Fri, 02 Dec 2022 13:16:46 +01:00 clocksource/drivers/timer-ti-dm: Fix missing clk_disable_unprepare in dmtim= er_systimer_init_clock() If clk_get_rate() fails which is called after clk_prepare_enable(), clk_disable_unprepare() need be called in error path to disable the clock in dmtimer_systimer_init_clock(). Fixes: 52762fbd1c47 ("clocksource/drivers/timer-ti-dm: Add clockevent and c= locksource support") Signed-off-by: Yang Yingliang Reviewed-by: Tony Lindgren Link: https://lore.kernel.org/r/20221029114427.946520-1-yangyingliang@huawe= i.com Signed-off-by: Daniel Lezcano --- drivers/clocksource/timer-ti-dm-systimer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksour= ce/timer-ti-dm-systimer.c index 2737407..632523c 100644 --- a/drivers/clocksource/timer-ti-dm-systimer.c +++ b/drivers/clocksource/timer-ti-dm-systimer.c @@ -345,8 +345,10 @@ static int __init dmtimer_systimer_init_clock(struct d= mtimer_systimer *t, return error; =20 r =3D clk_get_rate(clock); - if (!r) + if (!r) { + clk_disable_unprepare(clock); return -ENODEV; + } =20 if (is_ick) t->ick =3D clock;