diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-25 13:54:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-25 13:54:57 -0700 |
| commit | ba53c4518c7bf3b3abda54284cfb2a6d2175749b (patch) | |
| tree | 9f56beb17efa19aafebb40d245d5c159bf4c4b12 /drivers/iio | |
| parent | 63e553c0c5ad690fb0f4e9990dd77f93441b3afc (diff) | |
| parent | a4b9c109c2f9143790c1d1a96475eecf7338713a (diff) | |
Merge "Merge tag v4.4.55 into branch 'msm-4.4'"
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 a0d7deeac62f..3f90985d545e 100644 --- a/drivers/iio/pressure/mpl115.c +++ b/drivers/iio/pressure/mpl115.c @@ -136,6 +136,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 01b2e0b18878..0f5b8767ec2e 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -182,7 +182,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', @@ -195,7 +195,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', |