From ffed16cae4c34a4326eead22af690ff101b3780d Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Thu, 8 Aug 2013 14:38:58 -0700 Subject: [PATCH] Fix leaving keyboard scanning disabled on brief power button press If the power button is pressed for a shorter period than the debounce timeout, then the debounced state never changes. This was causing the power button state machine to disable scanning (in the interrupt handler) but never re-enable it (in the deferred handler). Easy fix; just re-enable based on whether the current state is released, not whether the debounced state is transitioning to released. BUG=chrome-os-partner:21772 BRANCH=all (falco, pit, etc.) TEST=type on console. briefly flick power button. type more; should work. Change-Id: I9723a6aa10f122fcee62702b85ce7981b1c8103a Signed-off-by: Randall Spangler Reviewed-on: https://gerrit.chromium.org/gerrit/65238 Reviewed-by: Duncan Laurie --- common/power_button.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/power_button.c b/common/power_button.c index c26fb8d5d4..bbbe205ba6 100644 --- a/common/power_button.c +++ b/common/power_button.c @@ -67,6 +67,10 @@ static void power_button_change_deferred(void) { const int new_pressed = raw_power_button_pressed(); + /* Re-enable keyboard scanning if power button is no longer pressed */ + if (!new_pressed) + keyboard_scan_enable(1); + /* If power button hasn't changed state, nothing to do */ if (new_pressed == debounced_power_pressed) return; @@ -75,10 +79,6 @@ static void power_button_change_deferred(void) CPRINTF("[%T power button %s]\n", new_pressed ? "pressed" : "released"); - /* Re-enable keyboard scanning if power button is no longer pressed */ - if (!new_pressed) - keyboard_scan_enable(1); - /* Call hooks */ hook_notify(HOOK_POWER_BUTTON_CHANGE);