diff options
| author | YiHsiang Peng <yihsiangpeng@google.com> | 2023-05-25 03:15:05 +0000 |
|---|---|---|
| committer | Yi-Hsiang Peng <yihsiangpeng@google.com> | 2023-05-26 08:11:30 +0000 |
| commit | 69a31ac8c5f46eda5aaef95d4d5250bb8c38edc7 (patch) | |
| tree | 47f31291e9e650b462dbf786a285c468f66afaff | |
| parent | 437a1cf895ed0ab700140614f92bda732745c332 (diff) | |
| download | bms-69a31ac8c5f46eda5aaef95d4d5250bb8c38edc7.tar.gz | |
p9221_charger: set val->intval to ret if an error occurs
For any errors in get_property, using "return 0 and set val->intval=ret"
Bug: 280627012
Change-Id: I0ee277b257fade66b2936c5aa9862470c37b1070
Signed-off-by: YiHsiang Peng <yihsiangpeng@google.com>
(cherry picked from commit aaf60317b98c788dfb089c8c5e55660f6f756f32)
| -rw-r--r-- | p9221_charger.c | 9 |
1 files changed, 5 insertions, 4 deletions
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); } |