diff options
| author | Justin Koh <justinkoh@google.com> | 2014-06-16 16:04:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-16 16:04:23 +0000 |
| commit | 48a2e8adf58c35df55227e9baff6a12a12faf880 (patch) | |
| tree | 39ec52f66f963023c9e3b77cc8589326f5d75769 | |
| parent | d0ba40f540b676dcea65f8db04c1220aa43c2ea3 (diff) | |
| parent | e677ba07721a9e16ca90bf6e95df52d92817d3f9 (diff) | |
| download | invensense-48a2e8adf58c35df55227e9baff6a12a12faf880.tar.gz | |
am e677ba07: Merge "Invensense: 6515: allow flush calls for step detector" into klp-modular-dev
* commit 'e677ba07721a9e16ca90bf6e95df52d92817d3f9':
Invensense: 6515: allow flush calls for step detector
| -rw-r--r-- | 6515/libsensors_iio/MPLSensor.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/6515/libsensors_iio/MPLSensor.cpp b/6515/libsensors_iio/MPLSensor.cpp index c63d8b4..b6d762a 100644 --- a/6515/libsensors_iio/MPLSensor.cpp +++ b/6515/libsensors_iio/MPLSensor.cpp @@ -5838,12 +5838,6 @@ int MPLSensor::flush(int handle) LOGV_IF(PROCESS_VERBOSE, "HAL: flush - select sensor %s (handle %d)", sname.string(), handle); - if (((what != StepDetector) && (!(mEnabled & (1 << what)))) || - ((what == StepDetector) && !(mFeatureActiveMask & INV_DMP_PEDOMETER))) { - LOGE_IF(ENG_VERBOSE, "HAL: flush - sensor %s not enabled", sname.string()); - return -EINVAL; - } - if(!(mBatchEnabled & (1 << what))) { LOGV_IF(PROCESS_VERBOSE, "HAL:flush - batch mode not enabled for sensor %s (handle %d)", sname.string(), handle); } |