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

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

regulator: as3711: Fix valid min_uV/max_UV checking in as3711_bound_check 



Below cases are supposed to be valid:

min_uV == max_uV == info->max_uV
min_uV == max_uV == rdev->desc->min_uV

Don't return -EINVAL for above cases.

This patch also includes below cleanups:
- Use rdev_get_drvdata(rdev) instead of rdev->reg_data.
- Remove unnecessary WARN_ON, it looks pointless.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f1e64f90

drivers/regulator/as3711-regulator.c

+3 −6
Original line number Diff line number Diff line
@@ -69,17 +69,14 @@ static int as3711_list_voltage_dldo(struct regulator_dev *rdev, 
static int as3711_bound_check(struct regulator_dev *rdev,

			      int *min_uV, int *max_uV)

{

	struct as3711_regulator_info *info = container_of(rdev->desc,

					struct as3711_regulator_info, desc);

	struct as3711_regulator *reg = rdev->reg_data;



	WARN_ON(reg->reg_info != info);

	struct as3711_regulator *reg = rdev_get_drvdata(rdev);

	struct as3711_regulator_info *info = reg->reg_info;



	dev_dbg(&rdev->dev, "%s(), %d, %d, %d\n", __func__,

		*min_uV, rdev->desc->min_uV, info->max_uV);



	if (*max_uV < *min_uV ||

	    *min_uV >= info->max_uV || rdev->desc->min_uV >= *max_uV)

	    *min_uV > info->max_uV || rdev->desc->min_uV > *max_uV)

		return -EINVAL;



	if (rdev->desc->n_voltages == 1)