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

[ Upstream commit 830c1ded356369cd1303e8bb87ce3fea6e744de8 ]

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

Fixes: dec727399a4b ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>

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