Skip to content

Commit bf3a3cd

Browse files
Qinglang Miaothierryreding
authored andcommitted
drm/tegra: sor: Disable clocks on error in tegra_sor_init()
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>
1 parent 123f01a commit bf3a3cd

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

  • drivers/gpu/drm/tegra

drivers/gpu/drm/tegra/sor.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3143,19 +3143,25 @@ static int tegra_sor_init(struct host1x_client *client)
31433143
if (err < 0) {
31443144
dev_err(sor->dev, "failed to deassert SOR reset: %d\n",
31453145
err);
3146+
clk_disable_unprepare(sor->clk);
31463147
return err;
31473148
}
31483149

31493150
reset_control_release(sor->rst);
31503151
}
31513152

31523153
err = clk_prepare_enable(sor->clk_safe);
3153-
if (err < 0)
3154+
if (err < 0) {
3155+
clk_disable_unprepare(sor->clk);
31543156
return err;
3157+
}
31553158

31563159
err = clk_prepare_enable(sor->clk_dp);
3157-
if (err < 0)
3160+
if (err < 0) {
3161+
clk_disable_unprepare(sor->clk_safe);
3162+
clk_disable_unprepare(sor->clk);
31583163
return err;
3164+
}
31593165

31603166
return 0;
31613167
}

0 commit comments

Comments
 (0)