lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 109/228] drm/imx: tve: fix regulator_disable error path
    Date
    From: Marco Felsch <m.felsch@pengutronix.de>

    [ 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>
    ---
    drivers/gpu/drm/imx/imx-tve.c | 20 ++++++++++----------
    1 file changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
    index bc27c26994641..c22c3e6e9b7ac 100644
    --- a/drivers/gpu/drm/imx/imx-tve.c
    +++ b/drivers/gpu/drm/imx/imx-tve.c
    @@ -498,6 +498,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);
    @@ -622,6 +629,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");
    @@ -668,18 +678,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)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 13:08    [W:4.076 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site