summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Berg <alecaberg@chromium.org>2015-11-10 12:03:25 -0800
committerchrome-bot <chrome-bot@chromium.org>2015-11-11 11:00:49 -0800
commit79ed6d36f7ac1c00038f585304c11655859508ce (patch)
treea0f3efd32ed893ec6794db871c6ebc86f6f864bd
parentdc4f1a5eb9fa34caf3ae80de953241dd80596174 (diff)
downloadchrome-ec-79ed6d36f7ac1c00038f585304c11655859508ce.tar.gz
charge_state_v2: fix CONFIG_CHARGER_NARROW_VDC option
Fix missing {} when CONFIG_CHARGER_NARROW_VDC enabled. Bug introduced in CL:309289. BUG=none BRANCH=none TEST=make -j buildall Change-Id: I8b045b7231ea9916595184e468f93c879f243c42 Signed-off-by: Alec Berg <alecaberg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/311796 Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--common/charge_state_v2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index f6ef3d3551..26c41324be 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -372,7 +372,7 @@ static int charge_request(int voltage, int current)
int r1 = EC_SUCCESS, r2 = EC_SUCCESS, r3 = EC_SUCCESS;
static int __bss_slow prev_volt, prev_curr;
- if (!voltage || !current)
+ if (!voltage || !current) {
#ifdef CONFIG_CHARGER_NARROW_VDC
current = 0;
/* With NVDC charger, keep VSYS voltage higher than battery */
@@ -383,6 +383,7 @@ static int charge_request(int voltage, int current)
#else
voltage = current = 0;
#endif
+ }
if (curr.ac) {
if (prev_volt != voltage || prev_curr != current)