regulator: Fix check of unsigned return value and transmit errors in wm831x_gp_ldo_ge...
authorRoel Kluin <roel.kluin@gmail.com>
Fri, 16 Oct 2009 12:16:15 +0000 (14:16 +0200)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 16 Nov 2009 09:57:17 +0000 (09:57 +0000)
If ret is unsigned, the checks for negative wm831x_reg_read() return values
are wrong. The error value should be transmitted to its caller, e.g.
wm831x_gp_ldo_get_status() which tests for a negative return value.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
drivers/regulator/wm831x-ldo.c

index bb61aede48010ec20e4b2b52e3c6bae6a9d91c18..902db56ce099676f6a2a3f2483dd0d7b3c75811f 100644 (file)
@@ -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;
-       unsigned int ret;
+       int ret;
 
        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)
-               return 0;
+               return ret;
 
        if (ret & WM831X_LDO1_LP_MODE)
                return REGULATOR_MODE_STANDBY;