Skip to contentSkip to conversation

regulator: Fix _regulator_get_voltage if get_voltage callback is NULL

PATCH Applied Axel Lin 3 participants 3 messages May 23, 2011 – May 24, 2011 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v3 1/1 regulator: Fix _regulator_get_voltage if get_voltage callback is NULL

In the case of get_voltage callback is NULL, current implementation in _regulator_get_voltage will return -EINVAL.

Also returns proper error if ret is negative value.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/regulator/core.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/regulator/core.c +5 -3
index 9493f61..d3e3879 100644
@@ -1886,12 +1886,14 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
 		if (sel < 0)
 			return sel;
 		ret = rdev->desc->ops->list_voltage(rdev, sel);
-	}
-	if (rdev->desc->ops->get_voltage)
+	} else if (rdev->desc->ops->get_voltage) {
 		ret = rdev->desc->ops->get_voltage(rdev);
-	else
+	} else {
 		return -EINVAL;
+	}
 
+	if (ret < 0)
+		return ret;
 	return ret - rdev->constraints->uV_offset;
 }
Signature · 1 line
1.7.1