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

Commit 0de41b36 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-linear-charger: Fix mutex deadlock in charger"

parents 795f6913 872b407f

drivers/power/qpnp-linear-charger.c

+4 −1
Original line number Diff line number Diff line
@@ -881,7 +881,10 @@ static int get_prop_capacity(struct qpnp_lbc_chip *chip) 
		return DEFAULT_CAPACITY;



	if (chip->bms_psy) {

		chip->bms_psy->get_property(chip->bms_psy,

				POWER_SUPPLY_PROP_CAPACITY, &ret);

		mutex_lock(&chip->chg_enable_lock);

		if (chip->chg_done)

			chip->bms_psy->get_property(chip->bms_psy,

					POWER_SUPPLY_PROP_CAPACITY, &ret);

		battery_status = get_prop_batt_status(chip);