diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-30 13:24:18 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2009-12-01 11:24:19 +0100 |
| commit | 7716977b6ae5a0cdd0afab5c6035c4d0ce53f599 (patch) | |
| tree | 9534843e6f393dba12bb843e1d846dc19d5349b1 | |
| parent | 29e553631b2a0d4eebd23db630572e1027a9967a (diff) | |
| download | linux-3.10-7716977b6ae5a0cdd0afab5c6035c4d0ce53f599.tar.gz linux-3.10-7716977b6ae5a0cdd0afab5c6035c4d0ce53f599.tar.bz2 linux-3.10-7716977b6ae5a0cdd0afab5c6035c4d0ce53f599.zip | |
mfd: Correct WM831X_MAX_ISEL_VALUE
There was confusion between the array size and the highest ISEL
value possible.
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/wm831x-core.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/wm831x/regulator.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index 49b7885c270..7f27576ca04 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c @@ -29,7 +29,7 @@ /* Current settings - values are 2*2^(reg_val/4) microamps. These are * exported since they are used by multiple drivers. */ -int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL] = { +int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1] = { 2, 2, 3, diff --git a/include/linux/mfd/wm831x/regulator.h b/include/linux/mfd/wm831x/regulator.h index f95466343fb..955d30fc6a2 100644 --- a/include/linux/mfd/wm831x/regulator.h +++ b/include/linux/mfd/wm831x/regulator.h @@ -1212,7 +1212,7 @@ #define WM831X_LDO1_OK_SHIFT 0 /* LDO1_OK */ #define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */ -#define WM831X_ISINK_MAX_ISEL 56 -extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL]; +#define WM831X_ISINK_MAX_ISEL 55 +extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1]; #endif |