aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-03-08 10:02:17 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-19 08:57:58 -0700
commit9225c509838dfef1d004552f8d909434812fc966 (patch)
tree50023d35cd32946ec7710e303c9968633ebf2e54 /drivers/regulator
parent508e8376b63e20e9191d3b80a3b32a31d0566aee (diff)
downloadkernel_samsung_smdk4412-9225c509838dfef1d004552f8d909434812fc966.tar.gz
kernel_samsung_smdk4412-9225c509838dfef1d004552f8d909434812fc966.tar.bz2
kernel_samsung_smdk4412-9225c509838dfef1d004552f8d909434812fc966.zip
regulator: Fix setting selector in tps6524x set_voltage function
commit f03570cf1709397ebe656608266b44ec772960c2 upstream. Don't assign the voltage to selector. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps6524x-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 9166aa0a9df..229b6f4bb8b 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -481,7 +481,7 @@ static int set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
if (i >= info->n_voltages)
i = info->n_voltages - 1;
- *selector = info->voltages[i];
+ *selector = i;
return write_field(hw, &info->voltage, i);
}