| commit | fe97ecb7e9fdabef4f5f2ce7e3f143227658209d | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Oct 30 16:24:34 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Oct 30 16:24:33 2012 -0700 |
| tree | 9b08dc21c0fe073cf91a6b05018e020bf01a598f | |
| parent | 626c1a5e99e0ecb1a662fba05eed1d93a5668932 [diff] | |
| parent | 552df98cfd7ab3f1a36655a65264ada21978611f [diff] |
Merge "power: pm8921-bms: dont adjust if batfet is open"
diff --git a/drivers/power/pm8921-bms.c b/drivers/power/pm8921-bms.c index 23903df..d144af7 100644 --- a/drivers/power/pm8921-bms.c +++ b/drivers/power/pm8921-bms.c
@@ -1398,7 +1398,7 @@ (s64)fcc_uah - uuc_uah); soc_est = bound_soc(soc_est); - if (ibat_ua < 0) { + if (ibat_ua < 0 && pm8921_is_batfet_closed()) { soc = charging_adjustments(chip, soc, vbat_uv, ibat_ua, batt_temp, chargecycles, fcc_uah, cc_uah, uuc_uah);