commit 3c1833228fcf029ff393c7dd4d57bf9f15f3228d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 23 16:36:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 23 16:36:24 2018 +0000
tree 9e69b1d408a7670d76f52d54dc1db508c6d026c6
parent 4d13c02c872ba48a361c1a0ab75a87980e20a518
parent 9fcc3d5b9940d5a99e3a9e0cc6b6686277a0676c

Merge "bmi160: fix step counter flush when spi command cannot be issued immediately" into pi-dev

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) {