Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "power: fg-alg: Fix race condition in Time To Empty (TTE)"

Browse source
This commit is contained in:
qctecmdr 2020-07-19 21:53:39 -07:00 • committed by Gerrit - the friendly Code Review server
commit d7bfd382cf
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/power/supply/qcom/fg-alg.c
View file

@ -1545,15 +1545,18 @@ int ttf_get_time_to_empty(struct ttf *ttf, int *val)
return 0;
}
mutex_lock(&ttf->lock);
rc = ttf_circ_buf_median(&ttf->ibatt, &ibatt_avg);
if (rc < 0) {
/* try to get instantaneous current */
rc = ttf->get_ttf_param(ttf->data, TTF_IBAT, &ibatt_avg);
if (rc < 0) {
pr_err("failed to get battery current, rc=%d\n", rc);
mutex_unlock(&ttf->lock);
return rc;
}
}
mutex_unlock(&ttf->lock);
ibatt_avg /= MILLI_UNIT;
/* clamp ibatt_avg to 100mA */