]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/tegra: rgb: Fix missing clk_put() in the error handling paths of tegra_dc_rgb_probe()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 2 Sep 2023 15:22:12 +0000 (17:22 +0200)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:16:59 +0000 (18:16 -0400)
[ Upstream commit 45c8034db47842b25a3ab6139d71e13b4e67b9b3 ]

If clk_get_sys(..., "pll_d2_out0") fails, the clk_get_sys() call must be
undone.

Add the missing clk_put and a new 'put_pll_d_out0' label in the error
handling path, and use it.

Fixes: 0c921b6d4ba0 ("drm/tegra: dc: rgb: Allow changing PLLD rate on Tegra30+")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0182895ead4e4730426616b0d9995954c960b634.1693667005.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/tegra/rgb.c

index 53c492b13d12983dc21c1143338142b64aa0798d..1e8ec50b759e467ed608a444f25059b7b03bac55 100644 (file)
@@ -254,7 +254,7 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)
                if (IS_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);
-                       goto remove;
+                       goto put_pll;
                }
        }
 
@@ -262,6 +262,8 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)
 
        return 0;
 
+put_pll:
+       clk_put(rgb->pll_d_out0);
 remove:
        tegra_output_remove(&rgb->output);
        return err;