projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regulator: Fix check of unsigned return value and transmit errors in wm831x_gp_ldo_ge...
[linux-2.6-block.git]
/
drivers
/
regulator
/
wm831x-ldo.c
diff --git
a/drivers/regulator/wm831x-ldo.c
b/drivers/regulator/wm831x-ldo.c
index bb61aede48010ec20e4b2b52e3c6bae6a9d91c18..902db56ce099676f6a2a3f2483dd0d7b3c75811f 100644
(file)
--- a/
drivers/regulator/wm831x-ldo.c
+++ b/
drivers/regulator/wm831x-ldo.c
@@
-175,18
+175,18
@@
static unsigned int wm831x_gp_ldo_get_mode(struct regulator_dev *rdev)
struct wm831x *wm831x = ldo->wm831x;
int ctrl_reg = ldo->base + WM831X_LDO_CONTROL;
int on_reg = ldo->base + WM831X_LDO_ON_CONTROL;
struct wm831x *wm831x = ldo->wm831x;
int ctrl_reg = ldo->base + WM831X_LDO_CONTROL;
int on_reg = ldo->base + WM831X_LDO_ON_CONTROL;
-
unsigned
int ret;
+ int ret;
ret = wm831x_reg_read(wm831x, on_reg);
if (ret < 0)
ret = wm831x_reg_read(wm831x, on_reg);
if (ret < 0)
- return
0
;
+ return
ret
;
if (!(ret & WM831X_LDO1_ON_MODE))
return REGULATOR_MODE_NORMAL;
ret = wm831x_reg_read(wm831x, ctrl_reg);
if (ret < 0)
if (!(ret & WM831X_LDO1_ON_MODE))
return REGULATOR_MODE_NORMAL;
ret = wm831x_reg_read(wm831x, ctrl_reg);
if (ret < 0)
- return
0
;
+ return
ret
;
if (ret & WM831X_LDO1_LP_MODE)
return REGULATOR_MODE_STANDBY;
if (ret & WM831X_LDO1_LP_MODE)
return REGULATOR_MODE_STANDBY;