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

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

regulator: da9052: Ensure setting current limit within specific range 



Checking da9052_current_limits[row][i] <= max_uA is not enough, it is possible
da9052_current_limits[row][i] may less than the requested min_uA.

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

drivers/regulator/da9052-regulator.c

+5 −5
Original line number Diff line number Diff line
@@ -129,17 +129,17 @@ static int da9052_dcdc_set_current_limit(struct regulator_dev *rdev, int min_uA, 
	else if (offset == 0)

		row = 1;



	if (min_uA > da9052_current_limits[row][DA9052_MAX_UA] ||

	    max_uA < da9052_current_limits[row][DA9052_MIN_UA])

		return -EINVAL;



	for (i = DA9052_CURRENT_RANGE - 1; i >= 0; i--) {

		if (da9052_current_limits[row][i] <= max_uA) {

		if ((min_uA <= da9052_current_limits[row][i]) &&

		    (da9052_current_limits[row][i] <= max_uA)) {

			reg_val = i;

			break;

		}

	}



	if (i < 0)

		return -EINVAL;



	/* Determine the even or odd position of the buck current limit

	 * register field

	*/