diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:43:34 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:43:34 +0200 |
| commit | 2e455c27bddbf8cf6d1039daea40de8e6865c453 (patch) | |
| tree | 3fd892aeae61b105e3c5c979550aabf54109a656 /drivers/iio/light | |
| parent | 05f6d02521d4c7a656c5135d6d81c345ce531ac0 (diff) | |
| parent | b2eafd7282fdfd148fc09032540b0ff42bfedfbf (diff) | |
| download | linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.gz linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.bz2 linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.zip | |
Merge branch 'for-4.1/sensor-hub' into for-linus
Conflicts:
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
include/linux/hid-sensor-hub.h
Diffstat (limited to 'drivers/iio/light')
| -rw-r--r-- | drivers/iio/light/hid-sensor-als.c | 3 | ||||
| -rw-r--r-- | drivers/iio/light/hid-sensor-prox.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c index 948acfc38b8c..1609ecdd01b0 100644 --- a/drivers/iio/light/hid-sensor-als.c +++ b/drivers/iio/light/hid-sensor-als.c @@ -101,7 +101,8 @@ static int als_read_raw(struct iio_dev *indio_dev, *val = sensor_hub_input_attr_get_raw_value( als_state->common_attributes.hsdev, HID_USAGE_SENSOR_ALS, address, - report_id); + report_id, + SENSOR_HUB_SYNC); hid_sensor_power_state(&als_state->common_attributes, false); } else { diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index 3ecf79ed08ac..91ecc46ffeaa 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -96,7 +96,8 @@ static int prox_read_raw(struct iio_dev *indio_dev, *val = sensor_hub_input_attr_get_raw_value( prox_state->common_attributes.hsdev, HID_USAGE_SENSOR_PROX, address, - report_id); + report_id, + SENSOR_HUB_SYNC); hid_sensor_power_state(&prox_state->common_attributes, false); } else { |