summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2012-06-03 21:31:09 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-04 10:44:24 +0100
commit00926369b745fb0c1e5c27cec35f6adc9752f2c4 (patch)
tree33184434217ad309dc61b8b5049b34279b73e811 /drivers/regulator
parent7d4be2f5ad223942577c2319153b86592f3da5b2 (diff)
downloadlinux-00926369b745fb0c1e5c27cec35f6adc9752f2c4.tar.gz
linux-00926369b745fb0c1e5c27cec35f6adc9752f2c4.tar.bz2
linux-00926369b745fb0c1e5c27cec35f6adc9752f2c4.zip
regulator: gpio-regulator: Fix finding of smallest value
Commit 4dbd8f63f07a (regulator: gpio-regulator: Set the smallest voltage/current in the specified range) forgot to set the newly introduced best_val. Therefore it stayed always at INT_MAX thus breaking the setting of the voltage. Included is also an init value for target, as warnings about a possibly uninitialised target started appearing with this fix. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/gpio-regulator.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index ebe2b5c2e2df..2c38bea5065e 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -104,13 +104,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, best_val = INT_MAX;
+ int ptr, target = 0, state, best_val = INT_MAX;
for (ptr = 0; ptr < data->nr_states; ptr++)
if (data->states[ptr].value < best_val &&
data->states[ptr].value >= min &&
- data->states[ptr].value <= max)
+ data->states[ptr].value <= max) {
target = data->states[ptr].gpios;
+ best_val = data->states[ptr].value;
+ }
if (best_val == INT_MAX)
return -EINVAL;