From: Axel Lin Date: Tue, 31 Jul 2012 13:28:26 +0000 (+0800) Subject: regulator: wm831x-ldo: Check return value of wm831x_reg_read() X-Git-Tag: firefly_0821_release~3680^2~2008^2^5~37 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=363506cd71a5cafeee67b236112f1baf8c30b0ea;p=firefly-linux-kernel-4.4.55.git regulator: wm831x-ldo: Check return value of wm831x_reg_read() wm831x_reg_read() returns negative error code on failure. This prevents using the error code as the value read. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c index 5cb70ca1e98d..56a6de3dd883 100644 --- a/drivers/regulator/wm831x-ldo.c +++ b/drivers/regulator/wm831x-ldo.c @@ -205,6 +205,8 @@ static int wm831x_gp_ldo_get_status(struct regulator_dev *rdev) /* Is it reporting under voltage? */ ret = wm831x_reg_read(wm831x, WM831X_LDO_UV_STATUS); + if (ret < 0) + return ret; if (ret & mask) return REGULATOR_STATUS_ERROR; @@ -469,6 +471,8 @@ static int wm831x_aldo_get_status(struct regulator_dev *rdev) /* Is it reporting under voltage? */ ret = wm831x_reg_read(wm831x, WM831X_LDO_UV_STATUS); + if (ret < 0) + return ret; if (ret & mask) return REGULATOR_STATUS_ERROR;