diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-05-28 18:42:14 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-05-28 18:42:14 -0700 |
| commit | 66aee7da65cb0a6b27284e23a5177624ede5fb1b (patch) | |
| tree | ab1f3ff61bde9f6e08e01eadac9d639194f07adf | |
| parent | 6128aabe8c14d785650e8ef4709f359a88bd993f (diff) | |
| parent | 977254c2429a4963ba9148ba4ea5ecc4bbac2f67 (diff) | |
| download | bms-66aee7da65cb0a6b27284e23a5177624ede5fb1b.tar.gz | |
Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
SBMerger: 526756187
Change-Id: I82c5da4b2b862df47d514555e56eac667c555e30
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | google_battery.c | 7 | ||||
| -rw-r--r-- | p9221_charger.c | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/google_battery.c b/google_battery.c index 428278f..d6ce2b9 100644 --- a/google_battery.c +++ b/google_battery.c @@ -2809,14 +2809,15 @@ static void batt_update_csi_status(struct batt_drv *batt_drv) gvotable_cast_long_vote(batt_drv->csi_status_votable, "CSI_STATUS_DSG", CSI_STATUS_NotCharging, - !is_disconnected && batt_drv->msc_state == MSC_DSG); + !is_disconnected && batt_drv->msc_state == MSC_DSG && + !batt_drv->chg_done); gvotable_cast_long_vote(batt_drv->csi_status_votable, "CSI_STATUS_100", CSI_STATUS_Charging, - !is_disconnected && batt_drv->chg_done); + !is_disconnected && batt_drv->batt_full && !batt_drv->chg_done); gvotable_cast_long_vote(batt_drv->csi_status_votable, "CSI_STATUS_CHG", - CSI_STATUS_Charging, !is_disconnected); + CSI_STATUS_Charging, !is_disconnected); } #define CSI_CHG_SPEED_MAX 100 diff --git a/p9221_charger.c b/p9221_charger.c index 8805f4e..ead5797 100644 --- a/p9221_charger.c +++ b/p9221_charger.c @@ -2031,9 +2031,8 @@ static int p9221_get_property(struct power_supply *psy, val->intval = p9221_get_psy_online(charger); break; case POWER_SUPPLY_PROP_SERIAL_NUMBER: + /* val->strval == NULL means NODATA */ val->strval = p9221_get_tx_id_str(charger); - if (val->strval == NULL) - return -ENODATA; break; case POWER_SUPPLY_PROP_CAPACITY: /* Zero may be returned on transition to wireless "online", as @@ -2055,8 +2054,10 @@ static int p9221_get_property(struct power_supply *psy, val->intval = rc ? : charger->wlc_dc_current_now; } else { - if (!charger->dc_icl_votable) - return -EAGAIN; + if (!charger->dc_icl_votable) { + val->intval = -EAGAIN; + break; + } val->intval = gvotable_get_current_int_vote( charger->dc_icl_votable); } |