queue-6.1/drm-tegra-dsi-fix-some-error-handling-paths-in-tegra.patch

   1 From 0daa0ac275cbb664d78a4ac206b1066bb09eada9 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Sat, 2 Sep 2023 17:22:08 +0200
   4 Subject: drm/tegra: dsi: Fix some error handling paths in tegra_dsi_probe()
   5
   6 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
   7
   8 [ Upstream commit 830c1ded356369cd1303e8bb87ce3fea6e744de8 ]
   9
  10 If an error occurs after calling tegra_output_probe(),
  11 tegra_output_remove() should be called as already done in the remove
  12 function.
  13
  14 Fixes: dec727399a4b ("drm/tegra: Add DSI support")
  15 Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
  16 Signed-off-by: Thierry Reding <treding@nvidia.com>
  17 Link: https://patchwork.freedesktop.org/patch/msgid/16820073278d031f6c474a08d5f22a255158585e.1693667005.git.christophe.jaillet@wanadoo.fr
  18 Signed-off-by: Sasha Levin <sashal@kernel.org>
  19 ---
  20  drivers/gpu/drm/tegra/dsi.c | 54 ++++++++++++++++++++++++-------------
  21  1 file changed, 35 insertions(+), 19 deletions(-)
  22
  23 diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
  24 index 6cbba2adb6e5a..815e32e05f600 100644
  25 --- a/drivers/gpu/drm/tegra/dsi.c
  26 +++ b/drivers/gpu/drm/tegra/dsi.c
  27 @@ -1586,44 +1586,58 @@ static int tegra_dsi_probe(struct platform_device *pdev)
  28
  29         if (!pdev->dev.pm_domain) {
  30                 dsi->rst = devm_reset_control_get(&pdev->dev, "dsi");
  31 -               if (IS_ERR(dsi->rst))
  32 -                       return PTR_ERR(dsi->rst);
  33 +               if (IS_ERR(dsi->rst)) {
  34 +                       err = PTR_ERR(dsi->rst);
  35 +                       goto remove;
  36 +               }
  37         }
  38
  39         dsi->clk = devm_clk_get(&pdev->dev, NULL);
  40 -       if (IS_ERR(dsi->clk))
  41 -               return dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk),
  42 -                                    "cannot get DSI clock\n");
  43 +       if (IS_ERR(dsi->clk)) {
  44 +               err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk),
  45 +                                   "cannot get DSI clock\n");
  46 +               goto remove;
  47 +       }
  48
  49         dsi->clk_lp = devm_clk_get(&pdev->dev, "lp");
  50 -       if (IS_ERR(dsi->clk_lp))
  51 -               return dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_lp),
  52 -                                    "cannot get low-power clock\n");
  53 +       if (IS_ERR(dsi->clk_lp)) {
  54 +               err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_lp),
  55 +                                   "cannot get low-power clock\n");
  56 +               goto remove;
  57 +       }
  58
  59         dsi->clk_parent = devm_clk_get(&pdev->dev, "parent");
  60 -       if (IS_ERR(dsi->clk_parent))
  61 -               return dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_parent),
  62 -                                    "cannot get parent clock\n");
  63 +       if (IS_ERR(dsi->clk_parent)) {
  64 +               err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_parent),
  65 +                                   "cannot get parent clock\n");
  66 +               goto remove;
  67 +       }
  68
  69         dsi->vdd = devm_regulator_get(&pdev->dev, "avdd-dsi-csi");
  70 -       if (IS_ERR(dsi->vdd))
  71 -               return dev_err_probe(&pdev->dev, PTR_ERR(dsi->vdd),
  72 -                                    "cannot get VDD supply\n");
  73 +       if (IS_ERR(dsi->vdd)) {
  74 +               err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->vdd),
  75 +                                   "cannot get VDD supply\n");
  76 +               goto remove;
  77 +       }
  78
  79         err = tegra_dsi_setup_clocks(dsi);
  80         if (err < 0) {
  81                 dev_err(&pdev->dev, "cannot setup clocks\n");
  82 -               return err;
  83 +               goto remove;
  84         }
  85
  86         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  87         dsi->regs = devm_ioremap_resource(&pdev->dev, regs);
  88 -       if (IS_ERR(dsi->regs))
  89 -               return PTR_ERR(dsi->regs);
  90 +       if (IS_ERR(dsi->regs)) {
  91 +               err = PTR_ERR(dsi->regs);
  92 +               goto remove;
  93 +       }
  94
  95         dsi->mipi = tegra_mipi_request(&pdev->dev, pdev->dev.of_node);
  96 -       if (IS_ERR(dsi->mipi))
  97 -               return PTR_ERR(dsi->mipi);
  98 +       if (IS_ERR(dsi->mipi)) {
  99 +               err = PTR_ERR(dsi->mipi);
 100 +               goto remove;
 101 +       }
 102
 103         dsi->host.ops = &tegra_dsi_host_ops;
 104         dsi->host.dev = &pdev->dev;
 105 @@ -1654,6 +1668,8 @@ static int tegra_dsi_probe(struct platform_device *pdev)
 106         mipi_dsi_host_unregister(&dsi->host);
 107  mipi_free:
 108         tegra_mipi_free(dsi->mipi);
 109 +remove:
 110 +       tegra_output_remove(&dsi->output);
 111         return err;
 112  }
 113
 114 --
 115 2.43.0
 116