From 22649558167bc7f09e61d7e0ef9813743c4ce260 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 22 Mar 2012 14:08:04 +0800 Subject: [PATCH] --- yaml --- r: 302112 b: refs/heads/master c: 4dbd8f63f07a9e945f053d61d6f313ad98dda39d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/gpio-regulator.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d5963e2f2ef4..1e770bd5795d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d442061da08e679ec8e7c004fd0450e799a2af7 +refs/heads/master: 4dbd8f63f07a9e945f053d61d6f313ad98dda39d diff --git a/trunk/drivers/regulator/gpio-regulator.c b/trunk/drivers/regulator/gpio-regulator.c index 42e1cb1835e5..5f9b6add5d1d 100644 --- a/trunk/drivers/regulator/gpio-regulator.c +++ b/trunk/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++) {