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

Commit b99fa91f 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-fg-gen3: Clear charge_full flag during discharging"

parents d3f263e8 9e024112

drivers/power/supply/qcom/qpnp-fg-gen3.c

+4 −3
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ static int fg_batt_miss_irq_en_cb(struct votable *votable, void *data, 
		enable_irq_wake(chip->irqs[BATT_MISSING_IRQ].irq);

	} else {

		disable_irq_wake(chip->irqs[BATT_MISSING_IRQ].irq);

		disable_irq(chip->irqs[BATT_MISSING_IRQ].irq);

		disable_irq_nosync(chip->irqs[BATT_MISSING_IRQ].irq);

	}



	return 0;
@@ -1167,7 +1167,7 @@ static int fg_delta_bsoc_irq_en_cb(struct votable *votable, void *data, 
		enable_irq_wake(chip->irqs[BSOC_DELTA_IRQ].irq);

	} else {

		disable_irq_wake(chip->irqs[BSOC_DELTA_IRQ].irq);

		disable_irq(chip->irqs[BSOC_DELTA_IRQ].irq);

		disable_irq_nosync(chip->irqs[BSOC_DELTA_IRQ].irq);

	}



	return 0;
@@ -1779,7 +1779,8 @@ static int fg_charge_full_update(struct fg_chip *chip) 
			fg_dbg(chip, FG_STATUS, "Terminated charging @ SOC%d\n",

				msoc);

		}

	} else if (msoc_raw <= recharge_soc && chip->charge_full) {

	} else if ((msoc_raw <= recharge_soc || !chip->charge_done)

			&& chip->charge_full) {

		if (chip->dt.linearize_soc) {

			chip->delta_soc = FULL_CAPACITY - msoc;