From: Axel Lin Date: Sat, 24 Jan 2015 04:01:12 +0000 (+0800) Subject: regulator: qcom_rpm: Don't update vreg->uV/mV if rpm_reg_write fails X-Git-Tag: MMI-PSA29.97-13-9~10711^2^3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c6515d2f00dc45d6bf5b6e56c9a7d4dc2e271563;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git regulator: qcom_rpm: Don't update vreg->uV/mV if rpm_reg_write fails Ensure get_voltage return correct voltage if set_voltage fails. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/qcom_rpm-regulator.c b/drivers/regulator/qcom_rpm-regulator.c index 8364ff331a81..95099e6bfce3 100644 --- a/drivers/regulator/qcom_rpm-regulator.c +++ b/drivers/regulator/qcom_rpm-regulator.c @@ -227,9 +227,11 @@ static int rpm_reg_set_mV_sel(struct regulator_dev *rdev, return uV; mutex_lock(&vreg->lock); - vreg->uV = uV; if (vreg->is_enabled) - ret = rpm_reg_write(vreg, req, vreg->uV / 1000); + ret = rpm_reg_write(vreg, req, uV / 1000); + + if (!ret) + vreg->uV = uV; mutex_unlock(&vreg->lock); return ret; @@ -252,9 +254,11 @@ static int rpm_reg_set_uV_sel(struct regulator_dev *rdev, return uV; mutex_lock(&vreg->lock); - vreg->uV = uV; if (vreg->is_enabled) - ret = rpm_reg_write(vreg, req, vreg->uV); + ret = rpm_reg_write(vreg, req, uV); + + if (!ret) + vreg->uV = uV; mutex_unlock(&vreg->lock); return ret;