Merge tag 'mips_fixes_5.1_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux.git] / drivers / regulator / tps65090-regulator.c

diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index db714d5edafc8846285b2bf500e4eb1a4ab334aa..0614551796a19a5877d0875d1097fecfeeb998a7 100644 (file)
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -480,6 +480,12 @@ static int tps65090_regulator_probe(struct platform_device *pdev)
                else
                        config.of_node = NULL;
 
+               /*
+                * Hand the GPIO descriptor management over to the regulator
+                * core, remove it from devres management.
+                */
+               if (config.ena_gpiod)
+                       devm_gpiod_unhinge(&pdev->dev, config.ena_gpiod);
                rdev = devm_regulator_register(&pdev->dev, ri->desc, &config);
                if (IS_ERR(rdev)) {
                        dev_err(&pdev->dev, "failed to register regulator %s\n",