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

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 {