regulator: Set delay to 0 if set_voltage_time_sel callback returns error

PATCH Superseded Axel Lin 2 participants 2 messages Feb 24, 2012 Voltage and current regulator framework

lore

Share & tools

lore

Axel Lin

author

2012-02-24 07:17 UTC #0 lore raw

PATCH 1/1 regulator: Set delay to 0 if set_voltage_time_sel callback returns error

rdev->desc->ops->set_voltage_time_sel may return negative error code. Set delay to 0 if we got error.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/regulator/core.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

drivers/regulator/core.c +2 -0

index beeeb7f..61448b6 100644
@@ -1892,6 +1892,8 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 			old_selector = ret;
 			delay = rdev->desc->ops->set_voltage_time_sel(rdev,
 						old_selector, selector);
+			if (delay < 0)
+				delay = 0;
 		}
 
 		if (best_val != INT_MAX) {

Signature · 1 line

1.7.5.4

Mark Brown

2012-02-24 14:51 UTC #1 lore raw

drivers/regulator/core.c static int _regulator_do_set_voltage(struct regulator_dev *rdev, · line 1896

Quoted 4 lines · Axel Lin

drivers/regulator/core.c +2 -0

 			delay = rdev->desc->ops->set_voltage_time_sel(rdev,
 						old_selector, selector);
+			if (delay < 0)
+				delay = 0;

We should complain if we get an error rather than silently ignore it, possibly we'll end up returning prior to the ramp finishing which may break things.