From 2033b8a2d6b407d8bb660faaddc389c33077abbc Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Tue, 27 Jan 2015 16:00:34 -0800 Subject: power_button_x86: Don't inhibit power button in S0 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 Change-Id: I68c9b6c07520992ebba9dcbeccc60ebfb41ca112 Reviewed-on: https://chromium-review.googlesource.com/243710 Reviewed-by: Alec Berg Reviewed-by: Randall Spangler --- common/power_button_x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.1