korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/tegra: dsi: Fix some error handling paths in tegra_dsi_probe()

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

Fixes: dec727399a ("drm/tegra: Add DSI support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/16820073278d031f6c474a08d5f22a255158585e.1693667005.git.christophe.jaillet@wanadoo.fr
This commit is contained in:
Christophe JAILLET 2023-09-02 17:22:08 +02:00 committed by Thierry Reding
parent 0800880f4e
commit 830c1ded35
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/gpu/drm/tegra/dsi.c
View File

@ -1596,44 +1596,58 @@ static int tegra_dsi_probe(struct platform_device *pdev)
if (!pdev->dev.pm_domain) { if (!pdev->dev.pm_domain) {
dsi->rst = devm_reset_control_get(&pdev->dev, "dsi"); dsi->rst = devm_reset_control_get(&pdev->dev, "dsi");
if (IS_ERR(dsi->rst)) if (IS_ERR(dsi->rst)) {
return PTR_ERR(dsi->rst); err = PTR_ERR(dsi->rst);
goto remove;
}
} }
dsi->clk = devm_clk_get(&pdev->dev, NULL); dsi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(dsi->clk)) if (IS_ERR(dsi->clk)) {
return dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk), err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk),
"cannot get DSI clock\n"); "cannot get DSI clock\n");
goto remove;
}
dsi->clk_lp = devm_clk_get(&pdev->dev, "lp"); dsi->clk_lp = devm_clk_get(&pdev->dev, "lp");
if (IS_ERR(dsi->clk_lp)) if (IS_ERR(dsi->clk_lp)) {
return dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_lp), err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_lp),
"cannot get low-power clock\n"); "cannot get low-power clock\n");
goto remove;
}
dsi->clk_parent = devm_clk_get(&pdev->dev, "parent"); dsi->clk_parent = devm_clk_get(&pdev->dev, "parent");
if (IS_ERR(dsi->clk_parent)) if (IS_ERR(dsi->clk_parent)) {
return dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_parent), err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_parent),
"cannot get parent clock\n"); "cannot get parent clock\n");
goto remove;
}
dsi->vdd = devm_regulator_get(&pdev->dev, "avdd-dsi-csi"); dsi->vdd = devm_regulator_get(&pdev->dev, "avdd-dsi-csi");
if (IS_ERR(dsi->vdd)) if (IS_ERR(dsi->vdd)) {
return dev_err_probe(&pdev->dev, PTR_ERR(dsi->vdd), err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->vdd),
"cannot get VDD supply\n"); "cannot get VDD supply\n");
goto remove;
}
err = tegra_dsi_setup_clocks(dsi); err = tegra_dsi_setup_clocks(dsi);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "cannot setup clocks\n"); dev_err(&pdev->dev, "cannot setup clocks\n");
return err; goto remove;
} }
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dsi->regs = devm_ioremap_resource(&pdev->dev, regs); dsi->regs = devm_ioremap_resource(&pdev->dev, regs);
if (IS_ERR(dsi->regs)) if (IS_ERR(dsi->regs)) {
return PTR_ERR(dsi->regs); err = PTR_ERR(dsi->regs);
goto remove;
}
dsi->mipi = tegra_mipi_request(&pdev->dev, pdev->dev.of_node); dsi->mipi = tegra_mipi_request(&pdev->dev, pdev->dev.of_node);
if (IS_ERR(dsi->mipi)) if (IS_ERR(dsi->mipi)) {
return PTR_ERR(dsi->mipi); err = PTR_ERR(dsi->mipi);
goto remove;
}
dsi->host.ops = &tegra_dsi_host_ops; dsi->host.ops = &tegra_dsi_host_ops;
dsi->host.dev = &pdev->dev; dsi->host.dev = &pdev->dev;
@ -1664,6 +1678,8 @@ unregister:
mipi_dsi_host_unregister(&dsi->host); mipi_dsi_host_unregister(&dsi->host);
mipi_free: mipi_free:
tegra_mipi_free(dsi->mipi); tegra_mipi_free(dsi->mipi);
remove:
tegra_output_remove(&dsi->output);
return err; return err;
} }