drm/imx: tve: fix regulator_disable error path

[ Upstream commit 7bb58b987fee26da2a1665c01033022624986b7c ]

Add missing regulator_disable() as devm_action to avoid dedicated
unbind() callback and fix the missing error handling.

Fixes: fcbc51e54d2a ("staging: drm/imx: Add support for Television Encoder (TVEv2)")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index 89cf0090feacafe57db686aaa0aef509f95089b2..9ae515f3171ec43633c5d07c86689f082c8311f7 100644 (file)
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -511,6 +511,13 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)
        return 0;
 }
 
+static void imx_tve_disable_regulator(void *data)
+{
+       struct imx_tve *tve = data;
+
+       regulator_disable(tve->dac_reg);
+}
+
 static bool imx_tve_readable_reg(struct device *dev, unsigned int reg)
 {
        return (reg % 4 == 0) && (reg <= 0xdc);
@@ -635,6 +642,9 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
                ret = regulator_enable(tve->dac_reg);
                if (ret)
                        return ret;
+               ret = devm_add_action_or_reset(dev, imx_tve_disable_regulator, tve);
+               if (ret)
+                       return ret;
        }
 
        tve->clk = devm_clk_get(dev, "tve");
@@ -681,18 +691,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
        return 0;
 }
 
-static void imx_tve_unbind(struct device *dev, struct device *master,
-       void *data)
-{
-       struct imx_tve *tve = dev_get_drvdata(dev);
-
-       if (!IS_ERR(tve->dac_reg))
-               regulator_disable(tve->dac_reg);
-}
-
 static const struct component_ops imx_tve_ops = {
        .bind   = imx_tve_bind,
-       .unbind = imx_tve_unbind,
 };
 
 static int imx_tve_probe(struct platform_device *pdev)