Merge commit 'v3.5-rc3' into x86/debug

Merge it in to pick up a fix that we are going to clean up in this
branch.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 9997d7aaca8..242851a4c1a 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -101,16 +101,20 @@ static int gpio_regulator_get_value(struct regulator_dev *dev)
 }
 
 static int gpio_regulator_set_value(struct regulator_dev *dev,
-                                        int min, int max)
+                                        int min, int max, unsigned *selector)
 {
         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 (selector)
+                                *selector = ptr;
+                }
 
         if (best_val == INT_MAX)
                 return -EINVAL;
@@ -128,7 +132,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev,
                                         int min_uV, int max_uV,
                                         unsigned *selector)
 {
-        return gpio_regulator_set_value(dev, min_uV, max_uV);
+        return gpio_regulator_set_value(dev, min_uV, max_uV, selector);
 }
 
 static int gpio_regulator_list_voltage(struct regulator_dev *dev,
@@ -145,7 +149,7 @@ static int gpio_regulator_list_voltage(struct regulator_dev *dev,
 static int gpio_regulator_set_current_limit(struct regulator_dev *dev,
                                         int min_uA, int max_uA)
 {
-        return gpio_regulator_set_value(dev, min_uA, max_uA);
+        return gpio_regulator_set_value(dev, min_uA, max_uA, NULL);
 }
 
 static struct regulator_ops gpio_regulator_voltage_ops = {
@@ -286,7 +290,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
 
         cfg.dev = &pdev->dev;
         cfg.init_data = config->init_data;
-        cfg.driver_data = &drvdata;
+        cfg.driver_data = drvdata;
 
         drvdata->dev = regulator_register(&drvdata->desc, &cfg);
         if (IS_ERR(drvdata->dev)) {