| Message ID | 4aadb3c97835f7b80f00819c3d549e6130384e67.1634365151.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: mxs-mmc: disable regulator on error and in the remove function | expand |
On Sat, 16 Oct 2021 at 08:21, Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > 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> Applied for next, thanks! Kind regards Uffe > --- > 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 947581de7860..8c3655d3be96 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.30.2 >
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 947581de7860..8c3655d3be96 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);
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> --- drivers/mmc/host/mxs-mmc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)