regulator: max8973: Let core handle GPIO descriptor
The probe path of this driver is a bit complex: sometimes the GPIO descriptor is passed to the regulator core, sometimes it is not. To handle it in a simple way: stick with the devm_* resource management and unhinge the GPIO descriptor devres handling right before passing it to the regulator core, if we pass it to the regulator core. Fixes: e7d2be696faa ("regulator: max8973: Pass descriptor instead of GPIO number") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
891ddbc79a
commit
48bd226f0a
@ -808,7 +808,13 @@ static int max8973_probe(struct i2c_client *client,
|
||||
config.of_node = client->dev.of_node;
|
||||
config.regmap = max->regmap;
|
||||
|
||||
/* Register the regulators */
|
||||
/*
|
||||
* Register the regulators
|
||||
* Turn the GPIO descriptor over to the regulator core for
|
||||
* lifecycle management if we pass an ena_gpiod.
|
||||
*/
|
||||
if (config.ena_gpiod)
|
||||
devm_gpiod_unhinge(&client->dev, config.ena_gpiod);
|
||||
rdev = devm_regulator_register(&client->dev, &max->desc, &config);
|
||||
if (IS_ERR(rdev)) {
|
||||
ret = PTR_ERR(rdev);
|
||||
|
Loading…
x
Reference in New Issue
Block a user