diff options
| author | Vincent Palatin <vpalatin@chromium.org> | 2013-04-25 09:39:42 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-25 11:21:54 -0700 |
| commit | e341982921a503e6be6f7f2c30a9e8f7d2c8d3ce (patch) | |
| tree | 7f84b854118b3904020b70dcd5353e0177717fdc | |
| parent | d13318a1eab569cea44b087a785803cca682c3d4 (diff) | |
| download | chrome-ec-e341982921a503e6be6f7f2c30a9e8f7d2c8d3ce.tar.gz | |
WORKAROUND: always detect special key combinations
When the fake battery key is asserted, the special runtime key
combination detection is counting the number of keys and getting 4
keys instead of 3.
In order to get the proper action in that case, relax the condition.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BRANCH=spring
BUG=chrome-os-partner:18919
TEST=on Spring, press alt+VolUp+R with and without charger plugged and
see the machine rebooting in both cases.
Change-Id: I6dc0787f48aa3802f1f2804be6ee50a013b35575
Reviewed-on: https://gerrit.chromium.org/gerrit/49187
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>
Reviewed-by: Sameer Nanda <snanda@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | chip/stm32/keyboard_scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chip/stm32/keyboard_scan.c b/chip/stm32/keyboard_scan.c index 2c35a59eb6..42a74884a8 100644 --- a/chip/stm32/keyboard_scan.c +++ b/chip/stm32/keyboard_scan.c @@ -258,7 +258,7 @@ static int check_runtime_keys(const uint8_t *state) ++num_press; } - if (num_press != 3) + if (num_press < 3) return 0; if (state[MASK_INDEX_KEYR] == MASK_VALUE_KEYR && |