evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: cpr3-regulator: correct CPR aging cleanup handling

Browse source 
Correct the condition checked in the CPR aging error cleanup path
so that a return code of 0 (success) is not returned when the
aging measurement fails.  Also, correct the order of the
arguments in the aging failure error message.

Change-Id: Ica925da95b5ab35f63bb0355470475733080a88c
CRs-Fixed: 1061372
Signed-off-by: David Collins <collinsd@codeaurora.org>
This commit is contained in:
David Collins 2016-05-23 16:39:45 -07:00
parent e97b6a0e02
commit dcd02f7848
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/regulator/cpr3-regulator.c
View file

@ -3523,7 +3523,7 @@ cleanup:
if (ctrl->ctrl_type == CPR_CTRL_TYPE_CPR4) {
rc2 = cpr3_ctrl_clear_cpr4_config(ctrl);
if (rc) {
if (rc2) {
cpr3_err(ctrl, "failed to clear CPR4 configuration,rc=%d\n",
rc2);
rc = rc2;
@ -3798,7 +3798,7 @@ static int cpr3_regulator_aging_adjust(struct cpr3_controller *ctrl)
max_aging_volt = max(max_aging_volt, aging_volt);
} else {
cpr3_err(ctrl, "CPR aging measurement failed after %d tries, rc=%d\n",
rc, CPR3_AGING_RETRY_COUNT);
j, rc);
ctrl->aging_failed = true;
ctrl->aging_required = false;
goto cleanup;