[PATCH v3] counter: ti-eqep: use devm for runtime PM to fix probe error path
From: Stepan Ionichev
Date: Fri May 29 2026 - 06:06:57 EST
ti_eqep_probe() enables runtime PM and takes a reference manually,
then returns directly via dev_err_probe() if devm_clk_get_enabled()
fails, leaking the runtime PM enable and usage count. v2 tried to
route that error through a manual cleanup label, but mixing a
devm-managed resource (the clock) with a manual pm_runtime unwind
is itself wrong: the devm clock release runs after the manual
unwind, in the wrong order.
Manage the runtime PM with devm instead: devm_pm_runtime_enable()
for the enable, pm_runtime_resume_and_get() with a devm action for
the get/put. Every probe error path then unwinds through devm in
the correct reverse order, and ti_eqep_remove() no longer has to
touch runtime PM.
Fixes: f213729f6796 ("counter: new TI eQEP driver")
Signed-off-by: Stepan Ionichev <sozdayvek@xxxxxxxxx>
---
v3:
- Manage runtime PM with devm (devm_pm_runtime_enable plus a devm
action for pm_runtime_put_sync); remove now-empty PM unwind from
ti_eqep_remove() (Andy)
- Reword commit message: v2 mixed devm with manual unwind, fix is
full devm conversion
v2: https://lore.kernel.org/all/20260525152137.7428-1-sozdayvek@xxxxxxxxx/
v1: https://lore.kernel.org/all/20260523184448.7609-1-sozdayvek@xxxxxxxxx/
drivers/counter/ti-eqep.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/counter/ti-eqep.c b/drivers/counter/ti-eqep.c
index d21c157e531a..b24c8a29201d 100644
--- a/drivers/counter/ti-eqep.c
+++ b/drivers/counter/ti-eqep.c
@@ -492,6 +492,11 @@ static const struct regmap_config ti_eqep_regmap16_config = {
.max_register = QCPRDLAT,
};
+static void ti_eqep_pm_put(void *dev)
+{
+ pm_runtime_put_sync(dev);
+}
+
static int ti_eqep_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -544,19 +549,25 @@ static int ti_eqep_probe(struct platform_device *pdev)
* parent PWMSS bus driver. On AM17xx, this comes from the PSC power
* domain.
*/
- pm_runtime_enable(dev);
- pm_runtime_get_sync(dev);
+ err = devm_pm_runtime_enable(dev);
+ if (err)
+ return err;
+
+ err = pm_runtime_resume_and_get(dev);
+ if (err)
+ return err;
+
+ err = devm_add_action_or_reset(dev, ti_eqep_pm_put, dev);
+ if (err)
+ return err;
clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(clk))
return dev_err_probe(dev, PTR_ERR(clk), "failed to enable clock\n");
err = counter_add(counter);
- if (err < 0) {
- pm_runtime_put_sync(dev);
- pm_runtime_disable(dev);
- return err;
- }
+ if (err < 0)
+ return dev_err_probe(dev, err, "Failed to add counter\n");
return 0;
}
@@ -564,11 +575,8 @@ static int ti_eqep_probe(struct platform_device *pdev)
static void ti_eqep_remove(struct platform_device *pdev)
{
struct counter_device *counter = platform_get_drvdata(pdev);
- struct device *dev = &pdev->dev;
counter_unregister(counter);
- pm_runtime_put_sync(dev);
- pm_runtime_disable(dev);
}
static const struct of_device_id ti_eqep_of_match[] = {
--
2.43.0