Merge "power: smb5: Avoid potential votable deadlock issue" (c5ab0121) · Commits · e / devices / android_kernel_fairphone_FP4

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1971,7 +1971,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;
		@@ -3112,7 +3112,7 @@ int smblib_get_prop_usb_online(struct smb_charger *chg,
		return rc;
		}

		if (is_client_vote_enabled(chg->usb_icl_votable,
		if (is_client_vote_enabled_locked(chg->usb_icl_votable,
		CHG_TERMINATION_VOTER)) {
		rc = smblib_get_prop_usb_present(chg, val);
		return rc;