diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-11-01 12:56:48 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-11-01 12:56:48 +0100 |
| commit | bc4fc409f4f0a6d34a8530c2c9841983ddc217f2 (patch) | |
| tree | ced8b0d9e8a1d18adabdd34a17d94265e28f04bc /drivers/pmdomain | |
| parent | da3d242cf169a6e8a4be6eea7411c65083e6ce75 (diff) | |
| parent | f7c7c5aa556378a2c8da72c1f7f238b6648f95fb (diff) | |
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.12-rc[n] into the next branch, to allow them
to get tested together with the new changes that are targeted for v6.13.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/pmdomain')
| -rw-r--r-- | drivers/pmdomain/imx/imx93-blk-ctrl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pmdomain/imx/imx93-blk-ctrl.c b/drivers/pmdomain/imx/imx93-blk-ctrl.c index 904ffa55b8f4..b10348ac10f0 100644 --- a/drivers/pmdomain/imx/imx93-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx93-blk-ctrl.c @@ -313,7 +313,9 @@ static void imx93_blk_ctrl_remove(struct platform_device *pdev) of_genpd_del_provider(pdev->dev.of_node); - for (i = 0; bc->onecell_data.num_domains; i++) { + pm_runtime_disable(&pdev->dev); + + for (i = 0; i < bc->onecell_data.num_domains; i++) { struct imx93_blk_ctrl_domain *domain = &bc->domains[i]; pm_genpd_remove(&domain->genpd); |