Skip to contentSkip to conversation

regulator: core: allow enabling without enable op

PATCH In review Alexandre Courbot 2 participants 2 messages Feb 25, 2014 Voltage and current regulator framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: core: allow enabling without enable op

Commit 14c32a3ce6676265d7a27ea64a4d406e6dbad111 replaced direct uses of ops->enable by calls to _regulator_do_enable. This prevents a fixed regulators without a GPIO from being probed, since the former code checked the existence of ops->enable and continued if it did not exist, while _regulator_do_enable return -EINVAL in that case.

This patch fixes this by allowing _regulator_do_enable to go through without error if ops->enable is not defined, similarly to what _regulator_do_disable already does.

---
 drivers/regulator/core.c | 2 --
 1 file changed, 2 deletions(-)
drivers/regulator/core.c +0 -2
index bdb12659dd41..4306422cee5d 100644
@@ -1763,8 +1763,6 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
 		ret = rdev->desc->ops->enable(rdev);
 		if (ret < 0)
 			return ret;
-	} else {
-		return -EINVAL;
 	}
 
 	/* Allow the regulator to ramp; it would be useful to extend
Signature · 1 line
1.9.0
Tested-by on v1 1/1
#1 lore raw
Quoted 11 lines · Alexandre Courbot

Commit 14c32a3ce6676265d7a27ea64a4d406e6dbad111 replaced direct uses of ops->enable by calls to _regulator_do_enable. This prevents a fixed regulators without a GPIO from being probed, since the former code checked the existence of ops->enable and continued if it did not exist, while _regulator_do_enable return -EINVAL in that case.

This patch fixes this by allowing _regulator_do_enable to go through without error if ops->enable is not defined, similarly to what _regulator_do_disable already does.

This patch fixes the fixed regulator registration failure on Exynos5420 board.

Signature · 2 lines
With warm regards,
Sachin