regulator: gpio-regulator: Set the smallest voltage/current in the specified range

Do not assume the gpio regulator states map is sorted in any order.
This patch ensures we always set the smallest voltage/current that falls within
the specified range.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 42e1cb1835e54e9534ced30aa7aaf49f2897bf38..5f9b6add5d1da0f590ffb3f8449ce1ca1983075d 100644 (file)
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -105,15 +105,15 @@ static int gpio_regulator_set_value(struct regulator_dev *dev,
                                        int min, int max)
 {
        struct gpio_regulator_data *data = rdev_get_drvdata(dev);
-       int ptr, target, state;
+       int ptr, target, state, best_val = INT_MAX;
 
-       target = -1;
        for (ptr = 0; ptr < data->nr_states; ptr++)
-               if (data->states[ptr].value >= min &&
+               if (data->states[ptr].value < best_val &&
+                   data->states[ptr].value >= min &&
                    data->states[ptr].value <= max)
                        target = data->states[ptr].gpios;
 
-       if (target < 0)
+       if (best_val == INT_MAX)
                return -EINVAL;
 
        for (ptr = 0; ptr < data->nr_gpios; ptr++) {