Commit 92d7a558 authored by Paolo Pisati's avatar Paolo Pisati Committed by Mark Brown
Browse files

regulator: core: if voltage scaling fails, restore original voltage values 



Signed-off-by: default avatarPaolo Pisati <paolo.pisati@canonical.com>
Tested-by: default avatarRobert Nelson <robertcnelson@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 29594404

drivers/regulator/core.c

+14 −2
Original line number Diff line number Diff line
@@ -2250,6 +2250,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
{

	struct regulator_dev *rdev = regulator->rdev;

	int ret = 0;

	int old_min_uV, old_max_uV;



	mutex_lock(&rdev->mutex);
@@ -2271,18 +2272,29 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
	ret = regulator_check_voltage(rdev, &min_uV, &max_uV);

	if (ret < 0)

		goto out;

	

	/* restore original values in case of error */

	old_min_uV = regulator->min_uV;

	old_max_uV = regulator->max_uV;

	regulator->min_uV = min_uV;

	regulator->max_uV = max_uV;



	ret = regulator_check_consumers(rdev, &min_uV, &max_uV);

	if (ret < 0)

		goto out;

		goto out2;



	ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);

	if (ret < 0)

		goto out2;

	

out:

	mutex_unlock(&rdev->mutex);

	return ret;

out2:

	regulator->min_uV = old_min_uV;

	regulator->max_uV = old_max_uV;

	mutex_unlock(&rdev->mutex);

	return ret;

}

EXPORT_SYMBOL_GPL(regulator_set_voltage);