Commit 466affa0 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

regulator: wm8994: Don't use devres for enable GPIOs

The regulator core takes over managing the lifetime of the enable GPIO
once the regulator is registered. As such we shouldn't register the
enable GPIO using devm, or it will be freed twice.
Reported-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7b51a821
...@@ -147,11 +147,14 @@ static int wm8994_ldo_probe(struct platform_device *pdev) ...@@ -147,11 +147,14 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
config.regmap = wm8994->regmap; config.regmap = wm8994->regmap;
config.init_data = &ldo->init_data; config.init_data = &ldo->init_data;
/* Look up LDO enable GPIO from the parent device node */ /*
gpiod = devm_gpiod_get_optional(pdev->dev.parent, * Look up LDO enable GPIO from the parent device node, we don't
id ? "wlf,ldo2ena" : "wlf,ldo1ena", * use devm because the regulator core will free the GPIO
GPIOD_OUT_LOW | */
GPIOD_FLAGS_BIT_NONEXCLUSIVE); gpiod = gpiod_get_optional(pdev->dev.parent,
id ? "wlf,ldo2ena" : "wlf,ldo1ena",
GPIOD_OUT_LOW |
GPIOD_FLAGS_BIT_NONEXCLUSIVE);
if (IS_ERR(gpiod)) if (IS_ERR(gpiod))
return PTR_ERR(gpiod); return PTR_ERR(gpiod);
config.ena_gpiod = gpiod; config.ena_gpiod = gpiod;
...@@ -184,6 +187,7 @@ static int wm8994_ldo_probe(struct platform_device *pdev) ...@@ -184,6 +187,7 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
gpiod_put(gpiod);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment