]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
regulator: as3711: Fix valid min_uV/max_UV checking in as3711_bound_check
authorAxel Lin <axel.lin@ingics.com>
Fri, 23 Nov 2012 16:50:52 +0000 (00:50 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Nov 2012 20:25:13 +0000 (20:25 +0000)
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: Axel Lin <axel.lin@ingics.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/as3711-regulator.c

index 81578bf7e3529f26b66f4fd451381fbb40c847e4..5e813b9059e7753aba801b1a813b99c51e7cff64 100644 (file)
@@ -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)