From 31713ea0f609497dd140d956209630c1cff41b60 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 31 Jul 2012 21:28:26 +0800 Subject: [PATCH] --- yaml --- r: 323334 b: refs/heads/master c: 363506cd71a5cafeee67b236112f1baf8c30b0ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/wm831x-ldo.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 23845c26f148..7e626c275c81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c7475c009260d02d56f940816bb7c86fce1542e +refs/heads/master: 363506cd71a5cafeee67b236112f1baf8c30b0ea diff --git a/trunk/drivers/regulator/wm831x-ldo.c b/trunk/drivers/regulator/wm831x-ldo.c index 5cb70ca1e98d..56a6de3dd883 100644 --- a/trunk/drivers/regulator/wm831x-ldo.c +++ b/trunk/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;