Skip to contentSkip to conversation

regulator: Set delay to 0 if set_voltage_time_sel callback returns error

PATCH New Axel Lin 1 participant 1 message Feb 24, 2012 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v3 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 and also show warning if set_voltage_time_sel returns error.

---
v3: only coding style change, the result should be the same as v2.
v2: show warning message if set_voltage_time_sel returns error.

 drivers/regulator/core.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/regulator/core.c +5 -1
index beeeb7f..5a6b8ba 100644
@@ -1890,8 +1890,12 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 			if (ret < 0)
 				return ret;
 			old_selector = ret;
-			delay = rdev->desc->ops->set_voltage_time_sel(rdev,
+			ret = rdev->desc->ops->set_voltage_time_sel(rdev,
 						old_selector, selector);
+			if (ret < 0)
+				rdev_warn(rdev, "set_voltage_time_sel() failed: %d\n", ret);
+			else
+				delay = ret;
 		}
 
 		if (best_val != INT_MAX) {
Signature · 1 line
1.7.5.4