diff options
| author |   Alison Schofield <amsfield22@gmail.com> | 2017-01-20 12:22:58 -0800 |
|---|---|---|
| committer |   Jonathan Cameron <jic23@kernel.org> | 2017-01-21 12:31:05 +0000 |
| commit | 3bc1abcddb24f55b9c251e03caa4f9bd22ff748b (patch) | |
| tree | 2a0ac35a0dfb44db067bec24eaedb49bc677f7f7 /drivers/iio/pressure/ms5611_core.c | |
| parent | iio: proximity: sx9500: claim direct mode during raw proximity reads (diff) | |
| download | linux-dev-3bc1abcddb24f55b9c251e03caa4f9bd22ff748b.tar.xz linux-dev-3bc1abcddb24f55b9c251e03caa4f9bd22ff748b.zip | |
iio: pressure: ms5611: claim direct mode during oversampling changes
Driver was checking for direct mode before changing oversampling
ratios, but was not locking it. Use the claim/release helper
functions to guarantee the device stays in direct mode while the
oversampling ratios are being updated. Continue to use the drivers
private state lock to protect against conflicting direct mode access
of the state data.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/pressure/ms5611_core.c')
| -rw-r--r-- | drivers/iio/pressure/ms5611_core.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c index 6bd53e702667..2a77a2f15752 100644 --- a/drivers/iio/pressure/ms5611_core.c +++ b/drivers/iio/pressure/ms5611_core.c @@ -308,6 +308,7 @@ static int ms5611_write_raw(struct iio_dev *indio_dev, { struct ms5611_state *st = iio_priv(indio_dev); const struct ms5611_osr *osr = NULL; + int ret; if (mask != IIO_CHAN_INFO_OVERSAMPLING_RATIO) return -EINVAL; @@ -321,12 +322,11 @@ static int ms5611_write_raw(struct iio_dev *indio_dev, if (!osr) return -EINVAL; - mutex_lock(&st->lock); + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; - if (iio_buffer_enabled(indio_dev)) { - mutex_unlock(&st->lock); - return -EBUSY; - } + mutex_lock(&st->lock); if (chan->type == IIO_TEMP) st->temp_osr = osr; @@ -334,6 +334,8 @@ static int ms5611_write_raw(struct iio_dev *indio_dev, st->pressure_osr = osr; mutex_unlock(&st->lock); + iio_device_release_direct_mode(indio_dev); + return 0; } |