evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qcom: smblib: report discharging in case of input OV"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-18 22:19:29 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1342831f8a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/power/supply/qcom/smb-lib.c
View file

@ -1535,14 +1535,16 @@ int smblib_get_prop_batt_status(struct smb_charger *chg,
if (val->intval != POWER_SUPPLY_STATUS_CHARGING) if (val->intval != POWER_SUPPLY_STATUS_CHARGING)
return 0; return 0;
rc = smblib_read(chg, BATTERY_CHARGER_STATUS_2_REG, &stat); rc = smblib_read(chg, BATTERY_CHARGER_STATUS_7_REG, &stat);
if (rc < 0) { if (rc < 0) {
smblib_err(chg, "Couldn't read BATTERY_CHARGER_STATUS_2 rc=%d\n", smblib_err(chg, "Couldn't read BATTERY_CHARGER_STATUS_2 rc=%d\n",
rc); rc);
return rc; return rc;
} }
if (stat & (BAT_TEMP_STATUS_TOO_HOT_BIT | BAT_TEMP_STATUS_TOO_COLD_BIT)) stat &= ENABLE_TRICKLE_BIT | ENABLE_PRE_CHARGING_BIT |
ENABLE_FAST_CHARGING_BIT | ENABLE_FULLON_MODE_BIT;
if (!stat)
val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
return 0; return 0;