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/orientation | |
| parent | Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-ucl... (diff) | |
| parent | HID: sensor: Update document for custom sensor (diff) | |
| download | linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.xz 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/orientation')
| -rw-r--r-- | drivers/iio/orientation/hid-sensor-incl-3d.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c b/drivers/iio/orientation/hid-sensor-incl-3d.c index 73854460bb2c..5930fa32a2ab 100644 --- a/drivers/iio/orientation/hid-sensor-incl-3d.c +++ b/drivers/iio/orientation/hid-sensor-incl-3d.c @@ -124,7 +124,8 @@ static int incl_3d_read_raw(struct iio_dev *indio_dev, *val = sensor_hub_input_attr_get_raw_value( incl_state->common_attributes.hsdev, HID_USAGE_SENSOR_INCLINOMETER_3D, address, - report_id); + report_id, + SENSOR_HUB_SYNC); else { hid_sensor_power_state(&incl_state->common_attributes, false); |