Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56f3f55c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 049e2d13 7716977b

drivers/mfd/wm831x-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/linux/mfd/wm831x/regulator.h

+2 −2
Original line number Diff line number Diff line
@@ -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