diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-01-27 16:00:34 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-29 06:48:45 +0000 |
| commit | 2033b8a2d6b407d8bb660faaddc389c33077abbc (patch) | |
| tree | 595ce43d6740c0d12eaeb84d0244b1c8b851944d | |
| parent | 70afa3898ca1f28dc7e254b63f2d5fb12ad6b273 (diff) | |
| download | chrome-ec-stabilize-6736.B.tar.gz | |
power_button_x86: Don't inhibit power button in S0stabilize-6736.B
Allow power button presses which turn the AP off.
TEST=Manual on Samus. Boot system with depleted battery, hit power
button at dev screen and verify AP powers off.
BUG=None
BRANCH=Samus
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I68c9b6c07520992ebba9dcbeccc60ebfb41ca112
Reviewed-on: https://chromium-review.googlesource.com/243710
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | common/power_button_x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/power_button_x86.c b/common/power_button_x86.c index 9570d9c3b3..f695b0ffdb 100644 --- a/common/power_button_x86.c +++ b/common/power_button_x86.c @@ -121,7 +121,8 @@ static void set_pwrbtn_to_pch(int high) * is too low. */ #ifdef CONFIG_CHARGER - if (!high && (charge_want_shutdown() || charge_prevent_power_on())) { + if (chipset_in_state(CHIPSET_STATE_ANY_OFF) && !high && + (charge_want_shutdown() || charge_prevent_power_on())) { CPRINTS("PB PCH pwrbtn ignored due to battery level"); high = 1; } |