From: Colin Ian King Date: Wed, 2 Sep 2020 13:31:17 +0000 (+0100) Subject: power: supply: charger-manager: fix incorrect check on charging_duration_ms X-Git-Tag: v5.10-rc1~72^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10a4357f4aebb30d20fe5f0297930b292862fed9;p=thirdparty%2Flinux.git power: supply: charger-manager: fix incorrect check on charging_duration_ms Currently the duration check on the discharging duration setting is checking the charging duration rather than the discharging duration due to a cut-n-paste coding error. Fix this by checking the value desc->charging_max_duration_ms. Addresses-Coverity: ("Copy-paste-error") Fixes: 8fcfe088e21a ("charger-manager: Support limit of maximum possible") Signed-off-by: Colin Ian King Signed-off-by: Sebastian Reichel --- diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c index b2ca79173f95f..6fcebe4415522 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -471,7 +471,7 @@ static int check_charging_duration(struct charger_manager *cm) } else if (cm->battery_status == POWER_SUPPLY_STATUS_NOT_CHARGING) { duration = curr - cm->charging_end_time; - if (duration > desc->charging_max_duration_ms) { + if (duration > desc->discharging_max_duration_ms) { dev_info(cm->dev, "Discharging duration exceed %ums\n", desc->discharging_max_duration_ms); ret = true;