Skip to contentSkip to conversation

regulator: da9055: Fix return wrong selector in da9055_regulator_get_voltage_sel

PATCH In review Axel Lin 2 participants 2 messages Nov 20, 2012

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: da9055: Fix return wrong selector in da9055_regulator_get_voltage_sel

We do "selector += info->volt.v_offset" in da9055_regulator_set_voltage_bits() to take care of voltage range that does not start with 0 offset. Thus in da9055_regulator_get_voltage_sel() we should do corresponding "sel -= volt.v_offset" before returning selector.
Otherwise, we pass wrong selector for list_voltage callback.

---
 drivers/regulator/da9055-regulator.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/regulator/da9055-regulator.c +3 -4
index 79c5665..dbcb43d 100644
@@ -232,10 +232,9 @@ static int da9055_regulator_get_voltage_sel(struct regulator_dev *rdev)
 		return ret;
 
 	sel = (ret & volt.v_mask);
-	if (sel <= volt.v_offset)
-		return 0;
-	else
-		return sel;
+	sel -= volt.v_offset;
+
+	return sel;
 }
 
 static int da9055_regulator_set_voltage_bits(struct regulator_dev *rdev,
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 5 lines · Axel Lin

We do "selector += info->volt.v_offset" in da9055_regulator_set_voltage_bits() to take care of voltage range that does not start with 0 offset. Thus in da9055_regulator_get_voltage_sel() we should do corresponding "sel -= volt.v_offset" before returning selector.
Otherwise, we pass wrong selector for list_voltage callback.

No, we should just be using raw register values as the selectors and fixing this in list_voltage() by returning 0 for invalid selectors.