xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-4.1/sensor-hub' into for-linus

Browse Source 
Conflicts:
	drivers/iio/common/hid-sensors/hid-sensor-trigger.c
	include/linux/hid-sensor-hub.h
This commit is contained in:
Jiri Kosina
2015-04-13 23:43:34 +02:00
parent 05f6d02521 b2eafd7282
commit 2e455c27bd
17 changed files with 1153 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/iio/accel/hid-sensor-accel-3d.c
View File

@@ -123,7 +123,8 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
*val = sensor_hub_input_attr_get_raw_value(
accel_state->common_attributes.hsdev,
HID_USAGE_SENSOR_ACCEL_3D, address,
report_id);
report_id,
SENSOR_HUB_SYNC);
else {
*val = 0;
hid_sensor_power_state(&accel_state->common_attributes,