lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 443/849] mmc: mxs-mmc: disable regulator on error and in the remove function
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit ce5f6c2c9b0fcb4094f8e162cfd37fb4294204f7 ]

    The 'reg_vmmc' regulator is enabled in the probe. It is never disabled.
    Neither in the error handling path of the probe nor in the remove
    function.

    Register a devm_action to disable it when needed.

    Fixes: 4dc5a79f1350 ("mmc: mxs-mmc: enable regulator for mmc slot")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/4aadb3c97835f7b80f00819c3d549e6130384e67.1634365151.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mmc/host/mxs-mmc.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
    index 947581de78601..8c3655d3be961 100644
    --- a/drivers/mmc/host/mxs-mmc.c
    +++ b/drivers/mmc/host/mxs-mmc.c
    @@ -552,6 +552,11 @@ static const struct of_device_id mxs_mmc_dt_ids[] = {
    };
    MODULE_DEVICE_TABLE(of, mxs_mmc_dt_ids);

    +static void mxs_mmc_regulator_disable(void *regulator)
    +{
    + regulator_disable(regulator);
    +}
    +
    static int mxs_mmc_probe(struct platform_device *pdev)
    {
    struct device_node *np = pdev->dev.of_node;
    @@ -591,6 +596,11 @@ static int mxs_mmc_probe(struct platform_device *pdev)
    "Failed to enable vmmc regulator: %d\n", ret);
    goto out_mmc_free;
    }
    +
    + ret = devm_add_action_or_reset(&pdev->dev, mxs_mmc_regulator_disable,
    + reg_vmmc);
    + if (ret)
    + goto out_mmc_free;
    }

    ssp->clk = devm_clk_get(&pdev->dev, NULL);
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:03    [W:2.135 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site