diff options
| author | Antti P Miettinen <amiettinen@nvidia.com> | 2011-10-07 14:14:54 +0300 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:26 -0800 |
| commit | c6268fc51cc9c3baca2fa7eaf48742b24595925e (patch) | |
| tree | a7b188bfffcbc191a3858a214f0e64f7aae70473 | |
| parent | 2e156d3288a8d5086ee828602e21efa7bce566d2 (diff) | |
regulator: tps6236x: Fix set_voltage to return selector value
Current regulator_ops interface expects selector value to be returned.
Not doing so results in uninitialized variables used.
Bug 886170
Change-Id: I206117fbb1524e5c272e0c94bdaef3b605978717
Reviewed-on: http://git-master/r/56652
Reviewed-by: Antti Miettinen <amiettinen@nvidia.com>
Tested-by: Antti Miettinen <amiettinen@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Rebase-Id: R6015e7534c82212f3b28f7fe450e635f0274f80d
| -rw-r--r-- | drivers/regulator/tps6236x-regulator.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/regulator/tps6236x-regulator.c b/drivers/regulator/tps6236x-regulator.c index e0d45487252d..f90e08a02966 100644 --- a/drivers/regulator/tps6236x-regulator.c +++ b/drivers/regulator/tps6236x-regulator.c @@ -129,7 +129,8 @@ static int tps6236x_reg_write(struct tps6236x_chip *tps, u8 reg, u8 val) return err; } static int __tps6236x_dcdc_set_voltage(struct tps6236x_chip *tps, - int min_uV, int max_uV) + int min_uV, int max_uV, + unsigned *selector) { int vsel; @@ -146,6 +147,8 @@ static int __tps6236x_dcdc_set_voltage(struct tps6236x_chip *tps, int mV = tps->voltages[vsel]; int uV = mV * 1000; if (min_uV <= uV && uV <= max_uV) { + if (selector) + *selector = vsel; return tps6236x_reg_write(tps, REG_VSET0 + tps->vsel_id, vsel); } @@ -187,11 +190,12 @@ static int tps6236x_dcdc_get_voltage(struct regulator_dev *dev) } static int tps6236x_dcdc_set_voltage(struct regulator_dev *dev, - int min_uV, int max_uV) + int min_uV, int max_uV, + unsigned *selector) { struct tps6236x_chip *tps = rdev_get_drvdata(dev); - return __tps6236x_dcdc_set_voltage(tps, min_uV, max_uV); + return __tps6236x_dcdc_set_voltage(tps, min_uV, max_uV, selector); } static int tps6236x_dcdc_list_voltage(struct regulator_dev *dev, @@ -288,7 +292,7 @@ static int tps6236x_init_dcdc(struct i2c_client *client, return 0; init_mV = pdata->init_uV; - return __tps6236x_dcdc_set_voltage(tps, init_mV, init_mV); + return __tps6236x_dcdc_set_voltage(tps, init_mV, init_mV, 0); } static int __devinit tps6236x_probe(struct i2c_client *client, |