diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-03-22 02:08:04 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-01 06:59:26 -0400 |
commit | 4dbd8f63f07a9e945f053d61d6f313ad98dda39d (patch) | |
tree | 1cdcdb85ff4a5965e5d74333ecd6c1bb49f12def /drivers/regulator/gpio-regulator.c | |
parent | 9d442061da08e679ec8e7c004fd0450e799a2af7 (diff) |
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>
Diffstat (limited to 'drivers/regulator/gpio-regulator.c')
-rw-r--r-- | drivers/regulator/gpio-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 42e1cb1835e5..5f9b6add5d1d 100644 --- 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, | |||
105 | int min, int max) | 105 | int min, int max) |
106 | { | 106 | { |
107 | struct gpio_regulator_data *data = rdev_get_drvdata(dev); | 107 | struct gpio_regulator_data *data = rdev_get_drvdata(dev); |
108 | int ptr, target, state; | 108 | int ptr, target, state, best_val = INT_MAX; |
109 | 109 | ||
110 | target = -1; | ||
111 | for (ptr = 0; ptr < data->nr_states; ptr++) | 110 | for (ptr = 0; ptr < data->nr_states; ptr++) |
112 | if (data->states[ptr].value >= min && | 111 | if (data->states[ptr].value < best_val && |
112 | data->states[ptr].value >= min && | ||
113 | data->states[ptr].value <= max) | 113 | data->states[ptr].value <= max) |
114 | target = data->states[ptr].gpios; | 114 | target = data->states[ptr].gpios; |
115 | 115 | ||
116 | if (target < 0) | 116 | if (best_val == INT_MAX) |
117 | return -EINVAL; | 117 | return -EINVAL; |
118 | 118 | ||
119 | for (ptr = 0; ptr < data->nr_gpios; ptr++) { | 119 | for (ptr = 0; ptr < data->nr_gpios; ptr++) { |