diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2015-11-18 13:39:44 -0800 |
|---|---|---|
| committer | ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> | 2015-12-01 19:01:36 +0000 |
| commit | b542a27e7819a4a447ddb8ba1069d3245a1c1a4b (patch) | |
| tree | dc6ddc75d4dbd8d2d0b932951800c00a59dd9412 | |
| parent | 20aff00c2b92665aec1957b1a962a52619a7105a (diff) | |
| download | chrome-ec-b542a27e7819a4a447ddb8ba1069d3245a1c1a4b.tar.gz | |
motion: At shutdown, access sensors only if initialized.
When sensor_shutdown() is called, the sensors may already been powered
off, or will be soon.
In that case, do not attempts to access them.
Check their state before setting range or disabling activities.
BRANCH=smaug
BUG=chromium:557966
TEST=compile
Change-Id: I60640b120a23f9aab393a93c4c67ef17222ced4e
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/314382
Reviewed-by: Alec Berg <alecaberg@chromium.org>
(cherry picked from commit cef0fdb90e17fae3fd9f035bb6ada17e2833369e)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/314955
| -rw-r--r-- | common/motion_sense.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/common/motion_sense.c b/common/motion_sense.c index 4854607482..110f620e9d 100644 --- a/common/motion_sense.c +++ b/common/motion_sense.c @@ -427,21 +427,28 @@ static void motion_sense_shutdown(void) #endif sensor_active = SENSOR_ACTIVE_S5; - for (i = 0; i < motion_sensor_count; i++) { sensor = &motion_sensors[i]; /* Forget about changes made by the AP */ sensor->config[SENSOR_CONFIG_AP].odr = 0; sensor->config[SENSOR_CONFIG_AP].ec_rate = 0; - sensor->drv->set_range(sensor, sensor->default_range, 0); } motion_sense_switch_sensor_rate(); + + for (i = 0; i < motion_sensor_count; i++) { + sensor = &motion_sensors[i]; + if (sensor->state != SENSOR_INITIALIZED) + continue; + sensor->drv->set_range(sensor, sensor->default_range, 0); + } /* Forget activities set by the AP */ #ifdef CONFIG_GESTURE_DETECTION_MASK mask = CONFIG_GESTURE_DETECTION_MASK; while (mask) { i = get_next_bit(&mask); sensor = &motion_sensors[i]; + if (sensor->state != SENSOR_INITIALIZED) + continue; sensor->drv->list_activities(sensor, &enabled, &disabled); /* exclude double tap, it is used internally. */ |