diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-03 02:41:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-03 02:41:49 +0300 |
| commit | 56f3f55cf9b604b924353ab6fcdac5fee5637ae3 (patch) | |
| tree | b031bd5d9833a27cec1c551e487810cc2bcb33c8 | |
| parent | 049e2d13b8e8a6d8be43e675a5ed9d4613819f65 (diff) | |
| parent | 7716977b6ae5a0cdd0afab5c6035c4d0ce53f599 (diff) | |
| download | linux-56f3f55cf9b604b924353ab6fcdac5fee5637ae3.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Correct WM831X_MAX_ISEL_VALUE
| -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 49b7885c2702..7f27576ca046 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 f95466343fb2..955d30fc6a27 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 |