diff options
Diffstat (limited to 'common/charge_state_v2.c')
-rw-r--r-- | common/charge_state_v2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 4401aa54bb..93e817d359 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -564,9 +564,14 @@ DECLARE_HOOK(HOOK_INIT, charger_init, HOOK_PRIO_DEFAULT); int get_desired_input_current(enum battery_present batt_present, const struct charger_info * const info) { - if (batt_present == BP_YES || system_is_locked()) + if (batt_present == BP_YES || system_is_locked()) { +#ifdef CONFIG_CHARGE_MANAGER + return MAX(CONFIG_CHARGER_INPUT_CURRENT, + charge_manager_get_charger_current()); +#else return CONFIG_CHARGER_INPUT_CURRENT; - else +#endif + } else return info->input_current_max; } |