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

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

Merge "qcom: smb1351: update CHARGING_ENABLE reporting logic" into msm-4.9

parents 87d8bbdd 2dcc76c4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1655,7 +1655,7 @@ static int smb1351_parallel_get_property(struct power_supply *psy,

	switch (prop) {
	case POWER_SUPPLY_PROP_CHARGING_ENABLED:
		val->intval = !chip->usb_suspended_status;
		val->intval = !chip->parallel_charger_suspended;
		break;
	case POWER_SUPPLY_PROP_CURRENT_MAX:
		if (!chip->parallel_charger_suspended)