[PATCH v5 2/2] media: qcom: iris: rollback OPP vote on PM resume failure

From: Hungyu Lin

Date: Mon Jun 08 2026 - 04:32:09 EST


Rollback the maximum OPP vote when
pm_runtime_resume_and_get() fails in
iris_enable_power_domains().

Use a standard rollback path to release the OPP vote when
power domain enablement does not complete successfully.

Fixes: bb8a95aa038e ("media: iris: implement power management")
Signed-off-by: Hungyu Lin <dennylin0707@xxxxxxxxx>
---
drivers/media/platform/qcom/iris/iris_resources.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index 6d3339423eec..3e18c6998f92 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -78,7 +78,16 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev)
if (ret)
return ret;

- return pm_runtime_resume_and_get(pd_dev);
+ ret = pm_runtime_resume_and_get(pd_dev);
+ if (ret)
+ goto err_opp;
+
+ return 0;
+
+err_opp:
+ iris_opp_set_rate(core->dev, 0);
+
+ return ret;
}

int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev)
--
2.34.1