drm/tegra: sor: Disable clocks on error in tegra_sor_init()

[ Upstream commit bf3a3cdcad40e5928a22ea0fd200d17fd6d6308d ]

Fix the missing clk_disable_unprepare() before return from
tegra_sor_init() in the error handling case.

Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 7ab1d1dc7cd7388491f71a17d0627db956d05fd3..352ae52be34188ad6cd790c8316942fc3bff0741 100644 (file)
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -2378,17 +2378,23 @@ static int tegra_sor_init(struct host1x_client *client)
                if (err < 0) {
                        dev_err(sor->dev, "failed to deassert SOR reset: %d\n",
                                err);
+                       clk_disable_unprepare(sor->clk);
                        return err;
                }
        }
 
        err = clk_prepare_enable(sor->clk_safe);
-       if (err < 0)
+       if (err < 0) {
+               clk_disable_unprepare(sor->clk);
                return err;
+       }
 
        err = clk_prepare_enable(sor->clk_dp);
-       if (err < 0)
+       if (err < 0) {
+               clk_disable_unprepare(sor->clk_safe);
+               clk_disable_unprepare(sor->clk);
                return err;
+       }
 
        return 0;
 }