diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 19:38:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 19:38:38 +0200 |
| commit | df47c0a638b07dab18b202b307506e4b86b02e9a (patch) | |
| tree | 4aa332ed227e39aa7d693b72c82348312feae1d1 /include | |
| parent | Merge tag 'iio-for-4.12d' of git://git.kernel.org/pub/scm/linux/kernel/git/ji... (diff) | |
| parent | IIO: bmp280-core.c: fix error in humidity calculation (diff) | |
| download | linux-df47c0a638b07dab18b202b307506e4b86b02e9a.tar.xz linux-df47c0a638b07dab18b202b307506e4b86b02e9a.zip | |
Merge tag 'iio-fixes-for-4.11e' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Fifth set of IIO fixes for the 4.11 cycle.
As these are rather late in the cycle, they may sneak over into 4.12.
There is a fix for a regression caused by another fix (hid sensors
hardware seems to vary a lot in how various corner cases are handled).
* ad7303
- fix channel description. Numeric values were being passed as characters
presumably leading to garbage from the userspace interface.
* as3935
- the write data macro was wrong so fix it.
* bmp280
- incorrect handling of negative values as being unsigned broke humidity
calculation.
* hid-sensor
- Restore the poll and hysteresis values after resume as some hardware
doesn't do it.
* stm32-trigger
- buglet in reading the sampling frequency
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid-sensor-hub.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h index 7ef111d3ecc5..f32d7c392c1e 100644 --- a/include/linux/hid-sensor-hub.h +++ b/include/linux/hid-sensor-hub.h @@ -231,6 +231,8 @@ struct hid_sensor_common { unsigned usage_id; atomic_t data_ready; atomic_t user_requested_state; + int poll_interval; + int raw_hystersis; struct iio_trigger *trigger; int timestamp_ns_scale; struct hid_sensor_hub_attribute_info poll; |