Skip to content

Commit 8fee481

Browse files
brooniegregkh
authored andcommitted
regulator: fixed: Rely on the core freeing the enable GPIO
[ Upstream commit 79a45dd ] In order to simplify ownership rules for enable GPIOs supplied by drivers regulator_register() always takes ownership of them, even if it ends up failing for some other reason. We therefore should not free the GPIO if registration fails but just let the core worry about things. Fixes: 636f461 (regulator: fixed: fix GPIO descriptor leak on register failure) Reported-by: Diederik de Haas <diederik@cknow-tech.com> Closes: https://lore.kernel.org/r/DEPEYUF5BRGY.UKFBWRRE8HNP@cknow-tech.com Tested-by: Diederik de Haas <diederik@cknow-tech.com> Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://patch.msgid.link/20251204-regulator-fixed-fix-gpiod-leak-v1-1-48efea5b82c2@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent bc6761c commit 8fee481

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

drivers/regulator/fixed.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,13 +330,10 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
330330

331331
drvdata->dev = devm_regulator_register(&pdev->dev, &drvdata->desc,
332332
&cfg);
333-
if (IS_ERR(drvdata->dev)) {
334-
ret = dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
335-
"Failed to register regulator: %ld\n",
336-
PTR_ERR(drvdata->dev));
337-
gpiod_put(cfg.ena_gpiod);
338-
return ret;
339-
}
333+
if (IS_ERR(drvdata->dev))
334+
return dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
335+
"Failed to register regulator: %ld\n",
336+
PTR_ERR(drvdata->dev));
340337

341338
platform_set_drvdata(pdev, drvdata);
342339

0 commit comments

Comments
 (0)