A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 21:59:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "hwmon: qti_amoled_ecm: return avg_current as 0 upon error exceptions"

Browse source
This commit is contained in:
qctecmdr 2021-03-11 21:11:04 -08:00 • committed by Gerrit - the friendly Code Review server
commit 45e958b803
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/hwmon/qti_amoled_ecm.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
*/
#define pr_fmt(fmt) "AMOLED_ECM: %s: " fmt, __func__
@ -337,9 +337,9 @@ static void ecm_average_work(struct work_struct *work)
mutex_lock(&ecm->sdam_lock);
if (!data->num_m_samples || !data->m_cumulative) {
pr_warn("Invalid data, num_m_samples=%u m_cumulative:%u\n",
pr_warn_ratelimited("Invalid data, num_m_samples=%u m_cumulative:%u\n",
data->num_m_samples, data->m_cumulative);
data->avg_current = -EINVAL;
data->avg_current = 0;
} else {
data->avg_current = data->m_cumulative / data->num_m_samples;
pr_debug("avg_current=%u mA\n", data->avg_current);
@ -510,11 +510,14 @@ static int handle_ecm_abort(struct amoled_ecm *ecm)
switch (mode) {
case ECM_MODE_MULTI_FRAMES:
data->avg_current = -EIO;
pr_warn_ratelimited("Multiple frames mode is not supported\n");
data->avg_current = 0;
break;
case ECM_MODE_CONTINUOUS:
if (data->num_m_samples < ECM_MIN_M_SAMPLES) {
data->avg_current = -EIO;
pr_warn_ratelimited("Too few samples %u for continuous mode\n",
data->num_m_samples);
data->avg_current = 0;
break;
}
@ -522,7 +525,8 @@ static int handle_ecm_abort(struct amoled_ecm *ecm)
schedule_delayed_work(&ecm->average_work, 0);
break;
default:
data->avg_current = -EINVAL;
pr_err_ratelimited("Invalid ECM operation mode: %u\n", mode);
data->avg_current = 0;
return -EINVAL;
}