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

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

Merge "power: qpnp-charger: don't allow ULPM usage when charging disabled"

parents 755c8617 1a1255ec

drivers/power/qpnp-charger.c

+6 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,9 @@ qpnp_chg_regulator_batfet_set(struct qpnp_chg_chip *chip, bool enable) 
{

	int rc = 0;



	if (chip->charging_disabled || !chip->bat_if_base)

		return rc;



	if (chip->type == SMBB)

		rc = qpnp_chg_masked_write(chip,

			chip->bat_if_base + CHGR_BAT_IF_SPARE,
@@ -2465,6 +2468,9 @@ qpnp_chg_bat_if_batfet_reg_enabled(struct qpnp_chg_chip *chip) 
	int rc = 0;

	u8 reg = 0;



	if (!chip->bat_if_base)

		return rc;



	if (chip->type == SMBB)

		rc = qpnp_chg_read(chip, &reg,

				chip->bat_if_base + CHGR_BAT_IF_SPARE, 1);