summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Mooney <charliemooney@chromium.org>2012-07-31 15:58:03 -0700
committerGerrit <chrome-bot@google.com>2012-07-31 16:42:06 -0700
commitae8e24acb764be386e06a9720c828ec5ce2353c3 (patch)
treebdf21f587a77f52a8ec28800ee5efc7ad1bf48c7
parent77000e73bc11308bbf872fa8bbdd2a43d9e58050 (diff)
downloadchrome-ec-ae8e24acb764be386e06a9720c828ec5ce2353c3.tar.gz
Fixing bug: Keyboard locks up after 8s pwr press
The EC was not re-enabling keyboard scanning on boot if the power button was released. This works fine if the power button is released before the shutdown is complete, but if the user holds it down until the device is completed powered down the lock will never be released, and the next time they turn on the computer, the keyboard won't work. To fix this, all that is needed is to make the power event task keep unlocking it whenever the power button isn't pressed down. There's no problem with unlocking multiple times, so it's not dangerous to do this. BUG=chrome-os-partner:12070 TEST=Boot the machine normally, then press and hold the power button until the machine is entirely powered down before releasing it. Press the power button a second time to turn on the machine. You should be able to type as normal. Change-Id: I88852ed228bd8f6a9446406bab642812ef1327db Signed-off-by: Charlie Mooney <charliemooney@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/28871 Reviewed-by: David Hendricks <dhendrix@chromium.org>
-rw-r--r--common/gaia_power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/gaia_power.c b/common/gaia_power.c
index 5026e886f1..2cc872ab03 100644
--- a/common/gaia_power.c
+++ b/common/gaia_power.c
@@ -175,7 +175,7 @@ static int check_for_power_off_event(void)
}
/* Dis/Enable keyboard scanning when the power button state changes */
- if (pressed != power_button_was_pressed)
+ if (!pressed || pressed != power_button_was_pressed)
keyboard_enable_scanning(!pressed);