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

Commit a3c2e33a 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: report trickle charging correctly"

parents a4e779ee be0ba3f8

drivers/power/qpnp-charger.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2030,7 +2030,7 @@ get_prop_batt_status(struct qpnp_chg_chip *chip) 
		return POWER_SUPPLY_CHARGE_TYPE_NONE;

	}



	if (chgr_sts & TRKL_CHG_ON_IRQ && bat_if_sts & BAT_FET_ON_IRQ)

	if ((chgr_sts & TRKL_CHG_ON_IRQ) && !(bat_if_sts & BAT_FET_ON_IRQ))

		return POWER_SUPPLY_STATUS_CHARGING;

	if (chgr_sts & FAST_CHG_ON_IRQ && bat_if_sts & BAT_FET_ON_IRQ)

		return POWER_SUPPLY_STATUS_CHARGING;