tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 56f3f55c 049e2d13

+3 -3
+1 -1
drivers/mfd/wm831x-core.c
··· 29 29 /* Current settings - values are 2*2^(reg_val/4) microamps. These are 30 30 * exported since they are used by multiple drivers. 31 31 */ 32 - int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL] = { 32 + int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1] = { 33 33 2, 34 34 2, 35 35 3,
+2 -2
include/linux/mfd/wm831x/regulator.h
··· 1212 1212 #define WM831X_LDO1_OK_SHIFT 0 /* LDO1_OK */ 1213 1213 #define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */ 1214 1214 1215 - #define WM831X_ISINK_MAX_ISEL 56 1216 - extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL]; 1215 + #define WM831X_ISINK_MAX_ISEL 55 1216 + extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1]; 1217 1217 1218 1218 #endif