From 5b963bf82e21b2fa59b551d9a9ae2648d1474067 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 23 May 2011 20:08:10 +0800 Subject: [PATCH] --- yaml --- r: 252186 b: refs/heads/master c: cb220d16f91f8d5fa1450c7af17e028e8cb3f0f1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f5ca83fec77c..bf316fea371a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ccee4ae8eab957ab6d534283db5bd27703dba03 +refs/heads/master: cb220d16f91f8d5fa1450c7af17e028e8cb3f0f1 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 9493f6111a38..d3e38790906e 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -1886,12 +1886,14 @@ static int _regulator_get_voltage(struct regulator_dev *rdev) if (sel < 0) return sel; ret = rdev->desc->ops->list_voltage(rdev, sel); - } - if (rdev->desc->ops->get_voltage) + } else if (rdev->desc->ops->get_voltage) { ret = rdev->desc->ops->get_voltage(rdev); - else + } else { return -EINVAL; + } + if (ret < 0) + return ret; return ret - rdev->constraints->uV_offset; }