diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
| commit | b27d9668be60d42904b71ab1a9e4d152c7b5c920 (patch) | |
| tree | 62c1b3e52abb5b60cc19a2a772b005e9f00b814b /drivers/regulator/fixed.c | |
| parent | 67a2ab931e9f79f516566e69c92e566b71fb20d1 (diff) | |
| parent | cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a (diff) | |
Merge branch 'regulator-4.21' into regulator-next
Diffstat (limited to 'drivers/regulator/fixed.c')
| -rw-r--r-- | drivers/regulator/fixed.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index ccc29038f19a..9abdb9130766 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -183,7 +183,11 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) */ gflags |= GPIOD_FLAGS_BIT_NONEXCLUSIVE; - cfg.ena_gpiod = devm_gpiod_get_optional(&pdev->dev, NULL, gflags); + /* + * Do not use devm* here: the regulator core takes over the + * lifecycle management of the GPIO descriptor. + */ + cfg.ena_gpiod = gpiod_get_optional(&pdev->dev, NULL, gflags); if (IS_ERR(cfg.ena_gpiod)) return PTR_ERR(cfg.ena_gpiod); |