summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2017-04-21 16:24:56 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-05-23 21:59:42 -0700
commite42da5ace4393868a610a51bba89730fafd11157 (patch)
tree2ff780fb33af345a8f4955614927d5f0f83992a7
parent4c9e99b5e9a13ceca37b51c671323e94f0bd8fc6 (diff)
downloadchrome-ec-e42da5ace4393868a610a51bba89730fafd11157.tar.gz
power_button_x86: Initialize to on if button is pressed
This change sets the initial power button state to init-on if the power button is pressed. BUG=b:37274183 BRANCH=none TEST=Enter recovery mode by power+recovery button press. Change-Id: I6ed849bc303e7cdbcb975ae2a6ff278093c86088 Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/486946 Reviewed-by: Duncan Laurie <dlaurie@google.com>
-rw-r--r--common/power_button_x86.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/power_button_x86.c b/common/power_button_x86.c
index ed8a677613..7fd7101c29 100644
--- a/common/power_button_x86.c
+++ b/common/power_button_x86.c
@@ -227,6 +227,9 @@ static void set_initial_pwrbtn_state(void)
*/
CPRINTS("PB init-off");
power_button_pch_release();
+ } else if (power_button_is_pressed()) {
+ CPRINTS("PB init-on");
+ pwrbtn_state = PWRBTN_STATE_INIT_ON;
} else {
/*
* All other EC reset conditions power on the main processor so