iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/tegra: rgb: Fix some error handling paths in tegra_dc_rgb_probe()

Browse Source 
[ Upstream commit bc456b5d93dbfdbd89f2a036f4f3d8026595f9e4 ]

If an error occurs after calling tegra_output_probe(),
tegra_output_remove() should be called as already done in the remove
function.

Fixes: 59d29c0ec93f ("drm/tegra: Allocate resources at probe time")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0001f61eb89048bc36241629b564195689cf54b6.1693667005.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2023-09-02 17:22:11 +02:00 committed by Sasha Levin
parent bb459d437d
commit 29f922ae4a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/tegra/rgb.c
View File

@ -214,26 +214,28 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)
rgb->clk = devm_clk_get(dc->dev, NULL); rgb->clk = devm_clk_get(dc->dev, NULL);
if (IS_ERR(rgb->clk)) { if (IS_ERR(rgb->clk)) {
dev_err(dc->dev, "failed to get clock\n"); dev_err(dc->dev, "failed to get clock\n");
return PTR_ERR(rgb->clk); err = PTR_ERR(rgb->clk);
goto remove;
} }
rgb->clk_parent = devm_clk_get(dc->dev, "parent"); rgb->clk_parent = devm_clk_get(dc->dev, "parent");
if (IS_ERR(rgb->clk_parent)) { if (IS_ERR(rgb->clk_parent)) {
dev_err(dc->dev, "failed to get parent clock\n"); dev_err(dc->dev, "failed to get parent clock\n");
return PTR_ERR(rgb->clk_parent); err = PTR_ERR(rgb->clk_parent);
goto remove;
} }
err = clk_set_parent(rgb->clk, rgb->clk_parent); err = clk_set_parent(rgb->clk, rgb->clk_parent);
if (err < 0) { if (err < 0) {
dev_err(dc->dev, "failed to set parent clock: %d\n", err); dev_err(dc->dev, "failed to set parent clock: %d\n", err);
return err; goto remove;
} }
rgb->pll_d_out0 = clk_get_sys(NULL, "pll_d_out0"); rgb->pll_d_out0 = clk_get_sys(NULL, "pll_d_out0");
if (IS_ERR(rgb->pll_d_out0)) { if (IS_ERR(rgb->pll_d_out0)) {
err = PTR_ERR(rgb->pll_d_out0); err = PTR_ERR(rgb->pll_d_out0);
dev_err(dc->dev, "failed to get pll_d_out0: %d\n", err); dev_err(dc->dev, "failed to get pll_d_out0: %d\n", err);
return err; goto remove;
} }
if (dc->soc->has_pll_d2_out0) { if (dc->soc->has_pll_d2_out0) {
@ -241,13 +243,17 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)
if (IS_ERR(rgb->pll_d2_out0)) { if (IS_ERR(rgb->pll_d2_out0)) {
err = PTR_ERR(rgb->pll_d2_out0); err = PTR_ERR(rgb->pll_d2_out0);
dev_err(dc->dev, "failed to get pll_d2_out0: %d\n", err); dev_err(dc->dev, "failed to get pll_d2_out0: %d\n", err);
return err; goto remove;
} }
} }
dc->rgb = &rgb->output; dc->rgb = &rgb->output;
return 0; return 0;
remove:
tegra_output_remove(&rgb->output);
return err;
} }
int tegra_dc_rgb_remove(struct tegra_dc *dc) int tegra_dc_rgb_remove(struct tegra_dc *dc)