Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 924c7eb29ee9..b42d01cef35a 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -67,7 +67,7 @@ static int wm8400_ldo_get_voltage(struct regulator_dev *dev)
 }
 
 static int wm8400_ldo_set_voltage(struct regulator_dev *dev,
-                                  int min_uV, int max_uV)
+                                  int min_uV, int max_uV, unsigned *selector)
 {
         struct wm8400 *wm8400 = rdev_get_drvdata(dev);
         u16 val;
@@ -93,6 +93,8 @@ static int wm8400_ldo_set_voltage(struct regulator_dev *dev,
                 val += 0xf;
         }
 
+        *selector = val;
+
         return wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),
                                WM8400_LDO1_VSEL_MASK, val);
 }
@@ -156,7 +158,7 @@ static int wm8400_dcdc_get_voltage(struct regulator_dev *dev)
 }
 
 static int wm8400_dcdc_set_voltage(struct regulator_dev *dev,
-                                  int min_uV, int max_uV)
+                                   int min_uV, int max_uV, unsigned *selector)
 {
         struct wm8400 *wm8400 = rdev_get_drvdata(dev);
         u16 val;
@@ -171,6 +173,8 @@ static int wm8400_dcdc_set_voltage(struct regulator_dev *dev,
                 return -EINVAL;
         BUG_ON(850000 + (25000 * val) < min_uV);
 
+        *selector = val;
+
         return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
                                WM8400_DC1_VSEL_MASK, val);
 }