Use the gpiod_get() rather than the devm_* version so that the
regulator core can handle the lifecycle of these descriptors.

Fixes: d7a261c2d1f2 ("regulator: max8952: Pass descriptor instead of GPIO 
number")
Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
---
ChangeLog v1->v2:
- Drop the gpiod_put() on the errorpath after devm_regulator_register()
  as this will be handled by the regulator core.
- Put a comment in the code so maintainers knows not to
  use managed resources (devm*)
---
 drivers/regulator/max8952.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index 6c39fff73b8a..cf2a2912cb1b 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -231,9 +231,13 @@ static int max8952_pmic_probe(struct i2c_client *client,
        else
                gflags = GPIOD_OUT_LOW;
        gflags |= GPIOD_FLAGS_BIT_NONEXCLUSIVE;
-       gpiod = devm_gpiod_get_optional(&client->dev,
-                                       "max8952,en",
-                                       gflags);
+       /*
+        * Do not use devm* here: the regulator core takes over the
+        * lifecycle management of the GPIO descriptor.
+        */
+       gpiod = gpiod_get_optional(&client->dev,
+                                  "max8952,en",
+                                  gflags);
        if (IS_ERR(gpiod))
                return PTR_ERR(gpiod);
        if (gpiod)
-- 
2.19.1

Reply via email to