diff options
| author | Fabien Parent <fparent@baylibre.com> | 2018-05-15 10:50:53 +0200 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-05-29 14:54:02 +0000 |
| commit | ba63740c410f4e31ee65ccbe3724da864da0e93a (patch) | |
| tree | f9e62b3ec3e314e42181d2902e12cab8ab1af950 | |
| parent | f7cbb8c6a19dd749df48db522e69b23e34b880f6 (diff) | |
| download | chrome-ec-ba63740c410f4e31ee65ccbe3724da864da0e93a.tar.gz | |
charge_manager: handle gracefully dedicated port
charge_manager_fill_power_info can be called to fill the power info
of the dedicated port. This function might call
charge_manager_get_source_current with the dedicated port, we don't
want to use assert in that case, but just fail gracefully by returning
0.
BRANCH=None
BUG=chromium:841944
TEST=Check that the function returns 0 for dedicated and not 0 for USB.
Change-Id: I357c056647e01bdb0e77a08a6c6b492aa3dbb503
Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-on: https://chromium-review.googlesource.com/1059248
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
(cherry picked from commit cd89b400a22702ab327b6fd261cd7d5c53b421e3)
Reviewed-on: https://chromium-review.googlesource.com/1072290
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | common/charge_manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c index 2bce8096cb..e4f54b58c4 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -217,7 +217,8 @@ static int charge_manager_is_seeded(void) */ static int charge_manager_get_source_current(int port) { - ASSERT(is_pd_port(port)); + if (!is_pd_port(port)) + return 0; switch (source_port_last_rp[port]) { case TYPEC_RP_3A0: |