diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-20 01:17:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-20 01:17:10 -0700 |
| commit | 226d13c582254e2ee7a6d6021865aa7d2fde2ead (patch) | |
| tree | 038ad0fb16f43b1c756fe88c8c5303c0c3b1ac01 | |
| parent | 91e4f874193f19cd4dce320f6944380d4686a47e (diff) | |
| parent | 95f429cba231e57e31f5657b61b61dd65c83bfb2 (diff) | |
Merge "power: pmic-voter: use force_val in rerun election" into msm-4.4
| -rw-r--r-- | drivers/power/supply/qcom/pmic-voter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/power/supply/qcom/pmic-voter.c b/drivers/power/supply/qcom/pmic-voter.c index b99558ed2100..f8134d1823be 100644 --- a/drivers/power/supply/qcom/pmic-voter.c +++ b/drivers/power/supply/qcom/pmic-voter.c @@ -438,12 +438,14 @@ out: int rerun_election(struct votable *votable) { int rc = 0; + int effective_result; lock_votable(votable); + effective_result = get_effective_result_locked(votable); if (votable->callback) rc = votable->callback(votable, - votable->data, - votable->effective_result, + votable->data, + effective_result, get_client_str(votable, votable->effective_client_id)); unlock_votable(votable); return rc; |