Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / regulator / max8649.c

diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 6b60a9c0366b3c5236fa7019844274c8b1155b3e..30eb9e54f7ec033a8ae7d889a5e42599c47a0a7c 100644 (file)
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -155,7 +155,7 @@ static int max8649_get_voltage(struct regulator_dev *rdev)
 }
 
 static int max8649_set_voltage(struct regulator_dev *rdev,
-                              int min_uV, int max_uV)
+                              int min_uV, int max_uV, unsigned *selector)
 {
        struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
        unsigned char data, mask;
@@ -168,6 +168,7 @@ static int max8649_set_voltage(struct regulator_dev *rdev,
        data = (min_uV - MAX8649_DCDC_VMIN + MAX8649_DCDC_STEP - 1)
                / MAX8649_DCDC_STEP;
        mask = MAX8649_VOL_MASK;
+       *selector = data & mask;
 
        return max8649_set_bits(info->i2c, info->vol_reg, mask, data);
 }