Skip to content

Commit

Permalink
PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe()
Browse files Browse the repository at this point in the history
[ Upstream commit 6049aae ]

If an error occurs after a successful pm_genpd_init() call, it should be
undone by a corresponding pm_genpd_remove().

Add the missing call in the error handling path, as already done in the
remove function.

Fixes: bf6910a ("power: avs: Add support for CPR (Core Power Reduction)")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/0f520597dbad89ab99c217c8986912fa53eaf5f9.1671293108.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tititiou36 authored and gregkh committed Feb 1, 2023
1 parent 964f121 commit ad5daeb
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/soc/qcom/cpr.c
Expand Up @@ -1708,12 +1708,16 @@ static int cpr_probe(struct platform_device *pdev)

ret = of_genpd_add_provider_simple(dev->of_node, &drv->pd);
if (ret)
return ret;
goto err_remove_genpd;

platform_set_drvdata(pdev, drv);
cpr_debugfs_init(drv);

return 0;

err_remove_genpd:
pm_genpd_remove(&drv->pd);
return ret;
}

static int cpr_remove(struct platform_device *pdev)
Expand Down

0 comments on commit ad5daeb

Please sign in to comment.