Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07351233 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

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.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 24751434

drivers/regulator/core.c

+5 −1
Original line number Diff line number Diff line
@@ -1836,8 +1836,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) {