diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-21 13:55:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-21 13:55:11 +0200 |
| commit | 7ed569206ebe7467b9c912b857ec46cf1c361111 (patch) | |
| tree | c3e0b92cc782439c33ae844e2520819a29700897 /drivers/regulator/88pm8607.c | |
| parent | e9d2b064149ff7ef4acbc65a1b9374ac8b218d3e (diff) | |
| parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) | |
| download | kernel_samsung_espresso10-7ed569206ebe7467b9c912b857ec46cf1c361111.zip kernel_samsung_espresso10-7ed569206ebe7467b9c912b857ec46cf1c361111.tar.gz kernel_samsung_espresso10-7ed569206ebe7467b9c912b857ec46cf1c361111.tar.bz2 | |
Merge commit 'v2.6.36-rc5' into perf/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/regulator/88pm8607.c')
| -rw-r--r-- | drivers/regulator/88pm8607.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c index 7d149a8..2ce2eb7 100644 --- a/drivers/regulator/88pm8607.c +++ b/drivers/regulator/88pm8607.c @@ -215,7 +215,7 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index) struct pm8607_regulator_info *info = rdev_get_drvdata(rdev); int ret = -EINVAL; - if (info->vol_table && (index < (2 << info->vol_nbits))) { + if (info->vol_table && (index < (1 << info->vol_nbits))) { ret = info->vol_table[index]; if (info->slope_double) ret <<= 1; @@ -233,7 +233,7 @@ static int choose_voltage(struct regulator_dev *rdev, int min_uV, int max_uV) max_uV = max_uV >> 1; } if (info->vol_table) { - for (i = 0; i < (2 << info->vol_nbits); i++) { + for (i = 0; i < (1 << info->vol_nbits); i++) { if (!info->vol_table[i]) break; if ((min_uV <= info->vol_table[i]) |