Merge branch 'topic/bypass' of git://git.kernel.org/pub/scm/linux/ker…

…nel/git/broonie/regulator into regulator-supply
mariux64 · Apr 27, 2016 · cbc13a6 · cbc13a6
2 parents c438b9d + fef9501
commit cbc13a6
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
@@ -3110,6 +3110,20 @@ EXPORT_SYMBOL_GPL(regulator_sync_voltage);
 static int _regulator_get_voltage(struct regulator_dev *rdev)
 {
 	int sel, ret;
+	bool bypassed;
+
+	if (rdev->desc->ops->get_bypass) {
+		ret = rdev->desc->ops->get_bypass(rdev, &bypassed);
+		if (ret < 0)
+			return ret;
+		if (bypassed) {
+			/* if bypassed the regulator must have a supply */
+			if (!rdev->supply)
+				return -EINVAL;
+
+			return _regulator_get_voltage(rdev->supply->rdev);
+		}
+	}
 
 	if (rdev->desc->ops->get_voltage_sel) {
 		sel = rdev->desc->ops->get_voltage_sel(rdev);