diff options
| author | Ruben Rodriguez Buchillon <coconutruben@chromium.org> | 2019-01-23 08:49:58 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-24 00:51:36 -0800 |
| commit | 544ba7da11eeeae342861b5ecfc72a50152a4711 (patch) | |
| tree | f6a1f9efd096420d14806bc15487646d7dc39624 | |
| parent | f5b3924cb146dfa4d22edf25d0efeda9e53422ea (diff) | |
| download | chrome-ec-544ba7da11eeeae342861b5ecfc72a50152a4711.tar.gz | |
powerbtn/button: fix crash on 0ms sleep
This change guards against crashing the EC when calling button or
powerbtn with a 0 as the argument.
BRANCH=None
BUG=chromium:905829
TEST=manual testing on soraka
> powerbtn 0
Simulating 0 ms power button press.
Simulating power button release.
> button vup 0
>
Change-Id: I022c9e48b0977b71b8706e5ffe8356a226a59077
Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1428500
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Yilun Lin <yllin@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
| -rw-r--r-- | common/button.c | 3 | ||||
| -rw-r--r-- | common/power_button.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common/button.c b/common/button.c index 1ccc548c75..4ca1dac852 100644 --- a/common/button.c +++ b/common/button.c @@ -367,7 +367,8 @@ static int console_command_button(int argc, char **argv) button_interrupt_simulate(button_idx); /* Hold the button(s) */ - msleep(press_ms); + if (press_ms > 0) + msleep(press_ms); /* Release the button(s) */ for (button_idx = 0; button_idx < BUTTON_COUNT; button_idx++) diff --git a/common/power_button.c b/common/power_button.c index a5da582afd..97ac7b0a77 100644 --- a/common/power_button.c +++ b/common/power_button.c @@ -179,7 +179,8 @@ static int command_powerbtn(int argc, char **argv) power_button_is_stable = 0; hook_call_deferred(&power_button_change_deferred_data, 0); - msleep(ms); + if (ms > 0) + msleep(ms); ccprintf("Simulating power button release.\n"); simulate_power_pressed = 0; |