diff options
| author | Thierry Reding <treding@nvidia.com> | 2020-01-31 17:59:09 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2020-01-31 21:29:16 +0100 |
| commit | ad2139cb80a7a9afbfe428d0448d351a84e22ee6 (patch) | |
| tree | cde5fd196d158f3173c4e0f6bb791bfe0ea7aa19 /drivers/gpu/drm/tegra | |
| parent | a5127a2dbe95dd72b6a21c98dee0857511f30357 (diff) | |
drm/tegra: sor: Disable runtime PM on probe failure
If the driver fails to probe, make sure to disable runtime PM again.
While at it, make the cleanup code in ->remove() symmetric.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/tegra')
| -rw-r--r-- | drivers/gpu/drm/tegra/sor.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 30c96b15d7a3..e79dd65c1b54 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -3925,13 +3925,13 @@ static int tegra_sor_probe(struct platform_device *pdev) sor->index); if (!name) { err = -ENOMEM; - goto remove; + goto rpm_disable; } err = host1x_client_resume(&sor->client); if (err < 0) { dev_err(sor->dev, "failed to resume: %d\n", err); - goto remove; + goto rpm_disable; } sor->clk_pad = tegra_clk_sor_pad_register(sor, name); @@ -3942,7 +3942,7 @@ static int tegra_sor_probe(struct platform_device *pdev) err = PTR_ERR(sor->clk_pad); dev_err(&pdev->dev, "failed to register SOR pad clock: %d\n", err); - goto remove; + goto rpm_disable; } INIT_LIST_HEAD(&sor->client.list); @@ -3953,11 +3953,13 @@ static int tegra_sor_probe(struct platform_device *pdev) if (err < 0) { dev_err(&pdev->dev, "failed to register host1x client: %d\n", err); - goto remove; + goto rpm_disable; } return 0; +rpm_disable: + pm_runtime_disable(&pdev->dev); remove: if (sor->ops && sor->ops->remove) sor->ops->remove(sor); @@ -3971,8 +3973,6 @@ static int tegra_sor_remove(struct platform_device *pdev) struct tegra_sor *sor = platform_get_drvdata(pdev); int err; - pm_runtime_disable(&pdev->dev); - err = host1x_client_unregister(&sor->client); if (err < 0) { dev_err(&pdev->dev, "failed to unregister host1x client: %d\n", @@ -3980,6 +3980,8 @@ static int tegra_sor_remove(struct platform_device *pdev) return err; } + pm_runtime_disable(&pdev->dev); + if (sor->ops && sor->ops->remove) { err = sor->ops->remove(sor); if (err < 0) |