commit 9fcc3d5b9940d5a99e3a9e0cc6b6686277a0676c
author Ben Fennema <fennema@google.com> Tue May 22 13:47:37 2018 -0700
committer Ben Fennema <fennema@google.com> Tue May 22 13:51:35 2018 -0700
tree 3de25a296755be8577a8460c432b5e1c2ef3d4dd
parent 9d6f44a64056c0a7bd8b1d3ff25d28a211af185a

bmi160: fix step counter flush when spi command cannot be issued immediately

Switch the order of the two operands in the && statement to avoid short
circuit evaluation from preventing stepCntFlushGetData from being called
when mTask.sensors[STEPCNT].flush > 0.

Bug: 80143800
Test: turn all sensors on with SensorLogger and issue a flush and verify
step counter flush increments
Signed-off-by: Ben Fennema <fennema@google.com>

Change-Id: I7019d5b9fd9908834efd7d4a41f7c919f19c9135

firmware/os/drivers/bosch_bmi160/bosch_bmi160.c

diff --git a/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c b/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c
index 34bad87..3f272d6 100644
--- a/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c
+++ b/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c
@@ -3344,7 +3344,7 @@
         }
     }
     if (mTask.sensors[STEPCNT].flush > 0 || T(pending_step_cnt)) {
-        T(pending_step_cnt) = T(pending_step_cnt) && !stepCntFlushGetData();
+        T(pending_step_cnt) = !stepCntFlushGetData() && T(pending_step_cnt);
         return;
     }
     if (mTask.pending_calibration_save) {