diff options
author | Koro Chen <koro.chen@mediatek.com> | 2016-07-05 15:40:49 +0800 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2016-08-25 21:00:08 +0000 |
commit | 7c60a0a0677414da2fe47f2b6256fef516e9b241 (patch) | |
tree | 3f3f869d3d1e919baf0778952e701a67139d1e04 | |
parent | c6b1eb838032016d1c18653c619ed9e3b7d0096a (diff) | |
download | chrome-ec-7c60a0a0677414da2fe47f2b6256fef516e9b241.tar.gz |
UPSTREAM: motion: Fix comparison between signed and unsigned integer
If wait_us < 0, comparison against motion_min_interval actually fails,
and this negative wait_us causes task_wait_event() never returns if we
are not using any motion task event except the timer. The motion task
will then stop running and sensor data stay unchanged.
BRANCH=samus
BUG=chrome-os-partner:54092, b:27849483
TEST=hardcode wait_us to a negative value before motion_min_interval check,
and see motion task is still running by EC console cmd timerinfo
Change-Id: Ic1e7ffeeb9d2ec1f5c5beb4387294014298123af
Signed-off-by: Koro Chen <koro.chen@mediatek.com>
Reviewed-on: https://chromium-review.googlesource.com/358332
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
(cherry picked from commit 3f5d978bd523caf5797fcfeed08a5d28e6d31d79)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/370572
-rw-r--r-- | common/motion_sense.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/motion_sense.c b/common/motion_sense.c index 758d995e83..da9e10d7e5 100644 --- a/common/motion_sense.c +++ b/common/motion_sense.c @@ -827,6 +827,9 @@ void motion_sense_task(void) wait_us = motion_interval - (ts_end_task.val - ts_begin_task.val); + /* and it cannnot be negative */ + wait_us = MAX(wait_us, 0); + /* * Guarantee some minimum delay to allow other lower * priority tasks to run. |