[PATCH] soc: fsl: cpm1: tsa: fix wrong clocks released on cleanup
flat view
WARM2d
From: Haotian Zhang <hidden>
Date: 2026-10-09 05:37:39
Also in:
linux-arm-kernel, lkml
Subsystem:
freescale quicc engine library, freescale quicc engine tsa driver, freescale soc drivers, the rest · Maintainers:
Qiang Zhao, Christophe Leroy, Herve Codina, Linus Torvalds
tsa_of_parse_tdms() gets and enables tdm->l1tsync_clk and
tdm->l1tclk_clk in addition to l1rsync_clk and l1rclk_clk, but the
error cleanup path releases l1rsync_clk/l1rclk_clk again in the
l1tsync_clk/l1tclk_clk branches. The tsync/tclk clocks are leaked --
never disabled nor clk_put() -- while rsync/rclk are clk_put() twice,
underflowing their reference counts. tsa_remove() has the same
copy-paste bug.
Release the clock actually held in each cleanup branch.
Fixes: 1d4ba0b81c1c ("soc: fsl: cpm1: Add support for TSA")
Assisted-by: DeepSeek-V4.1-Flash
Signed-off-by: Haotian Zhang <redacted>
---
drivers/soc/fsl/qe/tsa.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/soc/fsl/qe/tsa.c b/drivers/soc/fsl/qe/tsa.c
index 4a88e54d25b9..502e2ffe8689 100644
--- a/drivers/soc/fsl/qe/tsa.c
+++ b/drivers/soc/fsl/qe/tsa.c@@ -865,12 +865,12 @@ static int tsa_of_parse_tdms(struct tsa *tsa, struct device_node *np) clk_put(tsa->tdm[i].l1rclk_clk); } if (tsa->tdm[i].l1tsync_clk) { - clk_disable_unprepare(tsa->tdm[i].l1rsync_clk); - clk_put(tsa->tdm[i].l1rsync_clk); + clk_disable_unprepare(tsa->tdm[i].l1tsync_clk); + clk_put(tsa->tdm[i].l1tsync_clk); } if (tsa->tdm[i].l1tclk_clk) { - clk_disable_unprepare(tsa->tdm[i].l1rclk_clk); - clk_put(tsa->tdm[i].l1rclk_clk); + clk_disable_unprepare(tsa->tdm[i].l1tclk_clk); + clk_put(tsa->tdm[i].l1tclk_clk); } } return ret;
@@ -1039,12 +1039,12 @@ static void tsa_remove(struct platform_device *pdev) clk_put(tsa->tdm[i].l1rclk_clk); } if (tsa->tdm[i].l1tsync_clk) { - clk_disable_unprepare(tsa->tdm[i].l1rsync_clk); - clk_put(tsa->tdm[i].l1rsync_clk); + clk_disable_unprepare(tsa->tdm[i].l1tsync_clk); + clk_put(tsa->tdm[i].l1tsync_clk); } if (tsa->tdm[i].l1tclk_clk) { - clk_disable_unprepare(tsa->tdm[i].l1rclk_clk); - clk_put(tsa->tdm[i].l1rclk_clk); + clk_disable_unprepare(tsa->tdm[i].l1tclk_clk); + clk_put(tsa->tdm[i].l1tclk_clk); } } }
--
2.25.1