summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Palatin <vpalatin@chromium.org>2015-10-06 09:44:19 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2017-05-01 21:16:32 +0000
commita38cd9ca54104cf530a0a5d3bdb8ca972d589ff5 (patch)
treef34f07e11ce095b3c4ec91308413f2aeac7388c9
parenta98be61d83dad333f42096f6d54e38cdece8e373 (diff)
downloadchrome-ec-a38cd9ca54104cf530a0a5d3bdb8ca972d589ff5.tar.gz
UPSTREAM: motion: fix sensor interrupt interval computation
When a sensor has a null rate, do not reset the interrupt interval as we need the minimum for all used sensors. Signed-off-by: Vincent Palatin <vpalatin@chromium.org> BRANCH=smau, cyan, ultima BUG=b:2467859, b:27849483, b:36973851 TEST=Rotate a Ryu at the Home Screen and see a proper auto-rotation. Reviewed-on: https://chromium-review.googlesource.com/304132 Trybot-Ready: Vincent Palatin <vpalatin@chromium.org> Tested-by: Vincent Palatin <vpalatin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> Commit-Queue: Vincent Palatin <vpalatin@chromium.org> (cherry picked from commit 1c73c7958e5db4024e05d5e691918238107654d3) Reviewed-on: https://chromium-review.googlesource.com/304196 Commit-Ready: Vincent Palatin <vpalatin@chromium.org> Reviewed-by: Alec Berg <alecaberg@chromium.org> (cherry picked from commit f7022544bffac0964300405eb878b114d14128ae) Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/359385 Reviewed-on: https://chromium-review.googlesource.com/409472 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> (cherry picked from commit 68f218fa4beaf5d63724a0b395fd2e68ea8fc917) Change-Id: Ia4cbb1e8bc425c076af245f45a72b1beb356f686 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/489745
-rw-r--r--common/motion_sense.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/motion_sense.c b/common/motion_sense.c
index 5c4ac84ea4..bb63dce222 100644
--- a/common/motion_sense.c
+++ b/common/motion_sense.c
@@ -310,7 +310,8 @@ int motion_sense_set_motion_intervals(void)
ec_rate = sensor_ec_rate;
sensor_ec_rate = sensor->config[SENSOR_CONFIG_AP].ec_rate;
- if (ec_int_rate_ms == 0 || sensor_ec_rate < ec_int_rate_ms)
+ if (ec_int_rate_ms == 0 ||
+ (sensor_ec_rate && sensor_ec_rate < ec_int_rate_ms))
ec_int_rate_ms = sensor_ec_rate;
}
/*