[PATCH 4/6] drm/tegra: rgb: Fix some error handling paths in tegra_dc_rgb_probe()

[Christophe JAILLET]

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.jail...@wanadoo.fr>
---
 drivers/gpu/drm/tegra/rgb.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
index 79566c9ea8ff..26d4d87b83de 100644
--- a/drivers/gpu/drm/tegra/rgb.c
+++ b/drivers/gpu/drm/tegra/rgb.c
@@ -215,26 +215,28 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)
        rgb->clk = devm_clk_get(dc->dev, NULL);
        if (IS_ERR(rgb->clk)) {
                dev_err(dc->dev, "failed to get clock\n");
-               return PTR_ERR(rgb->clk);
+               err = PTR_ERR(rgb->clk);
+               goto tegra_remove;
        }
 
        rgb->clk_parent = devm_clk_get(dc->dev, "parent");
        if (IS_ERR(rgb->clk_parent)) {
                dev_err(dc->dev, "failed to get parent clock\n");
-               return PTR_ERR(rgb->clk_parent);
+               err = PTR_ERR(rgb->clk_parent);
+               goto tegra_remove;
        }
 
        err = clk_set_parent(rgb->clk, rgb->clk_parent);
        if (err < 0) {
                dev_err(dc->dev, "failed to set parent clock: %d\n", err);
-               return err;
+               goto tegra_remove;
        }
 
        rgb->pll_d_out0 = clk_get_sys(NULL, "pll_d_out0");
        if (IS_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);
-               return err;
+               goto tegra_remove;
        }
 
        if (dc->soc->has_pll_d2_out0) {
@@ -242,13 +244,17 @@ 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);
-                       return err;
+                       goto tegra_remove;
                }
        }
 
        dc->rgb = &rgb->output;
 
        return 0;
+
+tegra_remove:
+       tegra_output_remove(&rgb->output);
+       return err;
 }
 
 void tegra_dc_rgb_remove(struct tegra_dc *dc)
-- 
2.34.1