Merge "power: pmic-voter: use force_val in rerun election"

linux4microchip · Aug 8, 2017 · c0d71ef · c0d71ef
2 parents 17ecb2b + e6807af
commit c0d71ef
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/drivers/power/supply/qcom/pmic-voter.c b/drivers/power/supply/qcom/pmic-voter.c
@@ -438,12 +438,14 @@ int vote(struct votable *votable, const char *client_str, bool enabled, int val)
 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;