aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-03-19 23:29:00 +0100
committerKalimochoAz <calimochoazucarado@gmail.com>2012-03-19 23:29:00 +0100
commit96b165e5470cb58e747c257dadc44e427274fa83 (patch)
tree72d7b8f92428ae4000f05755aecdf73944e1879c /drivers/regulator
parentbd21819a35cd50e552ee2bfc240f76fc2eaab2ee (diff)
parent9bf176a3e029ae7f2dc6feae185091525a988be2 (diff)
downloadkernel_samsung_crespo-96b165e5470cb58e747c257dadc44e427274fa83.zip
kernel_samsung_crespo-96b165e5470cb58e747c257dadc44e427274fa83.tar.gz
kernel_samsung_crespo-96b165e5470cb58e747c257dadc44e427274fa83.tar.bz2
Merge branch 'linux-3.0.y' into cm.ics
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 9166aa0..229b6f4 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);
}