]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
regulator: fixed: Rely on the core freeing the enable GPIO
authorMark Brown <broonie@kernel.org>
Thu, 4 Dec 2025 19:39:34 +0000 (19:39 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Dec 2025 14:23:48 +0000 (14:23 +0000)
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: 636f4618b1cd (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>
drivers/regulator/fixed.c

index a2d16e9abfb58dc3ebd1c1c612fe699ae3487d95..254c0a8a455594e7605df7d09299b9a5a7f0785e 100644 (file)
@@ -330,13 +330,10 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
 
        drvdata->dev = devm_regulator_register(&pdev->dev, &drvdata->desc,
                                               &cfg);
-       if (IS_ERR(drvdata->dev)) {
-               ret = dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
-                                   "Failed to register regulator: %ld\n",
-                                   PTR_ERR(drvdata->dev));
-               gpiod_put(cfg.ena_gpiod);
-               return ret;
-       }
+       if (IS_ERR(drvdata->dev))
+               return dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
+                                    "Failed to register regulator: %ld\n",
+                                    PTR_ERR(drvdata->dev));
 
        platform_set_drvdata(pdev, drvdata);