Merge "power: qpnp-smbcharger: stop vfloat adjustments when batt temp is not good" (a918a1b1) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/qpnp-smbcharger.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3722,6 +3722,7 @@ static void smbchg_vfloat_adjust_work(struct work_struct *work)
		int vbat_uv, vbat_mv, ibat_ua, rc, delta_vfloat_mv;
		bool taper, enable;

		smbchg_stay_awake(chip, PM_REASON_VFLOAT_ADJUST);
		taper = (get_prop_charge_type(chip)
		== POWER_SUPPLY_CHARGE_TYPE_TAPER);
		enable = taper && (chip->parallel.current_max_ma == 0);
		@@ -3735,7 +3736,7 @@ static void smbchg_vfloat_adjust_work(struct work_struct *work)

		if (get_prop_batt_health(chip) != POWER_SUPPLY_HEALTH_GOOD) {
		pr_smb(PR_STATUS, "JEITA active, skipping\n");
		goto reschedule;
		goto stop;
		}

		set_property_on_fg(chip, POWER_SUPPLY_PROP_UPDATE_NOW, 1);