diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-11 16:46:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-11 16:46:03 +0100 |
| commit | b96dea60bc1a1d2f3991457397f833033bfbd988 (patch) | |
| tree | 67dcfb9ab7d43554aeb0ca586351d1b28dc856cf /drivers/iio | |
| parent | 9d3352a3fe82b927d66309ee7f1944dd40a42325 (diff) | |
| parent | 6a6e1d56a0769795a36c0461c64bf5e5b9bbb4c0 (diff) | |
| download | linux-stable-b96dea60bc1a1d2f3991457397f833033bfbd988.tar.gz linux-stable-b96dea60bc1a1d2f3991457397f833033bfbd988.tar.bz2 linux-stable-b96dea60bc1a1d2f3991457397f833033bfbd988.zip | |
Merge tag 'iio-fixes-for-4.11a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
First set of IIO fixes for the 4.11 cycle. Regression fixes from 4.10.
These are fixes that came in just to late for the 4.10 cycle.
Two drivers made an accidental assumption of structure arrangement for
struct iio_dev that are no longer true. It was a typo in the first place
that happened to work until some elements were added to the structure.
* mpl3115
- don't rely on structure field ordering
* mpl115
- don't rely on structure field ordering.
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/pressure/mpl115.c | 1 | ||||
| -rw-r--r-- | drivers/iio/pressure/mpl3115.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iio/pressure/mpl115.c b/drivers/iio/pressure/mpl115.c index 73f2f0c46e62..8f2bce213248 100644 --- a/drivers/iio/pressure/mpl115.c +++ b/drivers/iio/pressure/mpl115.c @@ -137,6 +137,7 @@ static const struct iio_chan_spec mpl115_channels[] = { { .type = IIO_TEMP, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_SCALE), }, }; diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index cc3f84139157..525644a7442d 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -190,7 +190,7 @@ static const struct iio_chan_spec mpl3115_channels[] = { { .type = IIO_PRESSURE, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .scan_index = 0, .scan_type = { .sign = 'u', @@ -203,7 +203,7 @@ static const struct iio_chan_spec mpl3115_channels[] = { { .type = IIO_TEMP, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .scan_index = 1, .scan_type = { .sign = 's', |