Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e10998b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb5: Avoid potential votable deadlock issue"

parents 1b9dee86 d4a13e4e

drivers/power/supply/qcom/smb5-lib.c

+1 −2
Original line number Diff line number Diff line
@@ -1490,7 +1490,7 @@ int smblib_get_prop_batt_status(struct smb_charger *chg, 
	 * If charge termination WA is active and has suspended charging, then

	 * continue reporting charging status as FULL.

	 */

	if (is_client_vote_enabled(chg->usb_icl_votable,

	if (is_client_vote_enabled_locked(chg->usb_icl_votable,

						CHG_TERMINATION_VOTER)) {

		val->intval = POWER_SUPPLY_STATUS_FULL;

		return 0;
@@ -2854,7 +2854,6 @@ irqreturn_t batt_temp_changed_irq_handler(int irq, void *data) 
		return IRQ_HANDLED;

	}



	rerun_election(chg->fcc_votable);

	power_supply_changed(chg->batt_psy);

	return IRQ_HANDLED;

}