diff options
| author |   Alison Schofield <amsfield22@gmail.com> | 2017-01-20 14:11:30 -0800 |
|---|---|---|
| committer |   Jonathan Cameron <jic23@kernel.org> | 2017-01-21 12:21:53 +0000 |
| commit | 6b2e7589b82ff534dd5c6d67dd83c53f13691bec (patch) | |
| tree | 18742d56b32e64a7628b1cd2b8bd5c4e4c660241 /drivers/iio | |
| parent | iio: magnetometer: mag3110: claim direct mode during raw writes (diff) | |
| download | linux-dev-6b2e7589b82ff534dd5c6d67dd83c53f13691bec.tar.xz linux-dev-6b2e7589b82ff534dd5c6d67dd83c53f13691bec.zip | |
iio: proximity: sx9500: claim direct mode during raw proximity reads
Driver was checking for direct mode but not locking it. Use the
claim/release helper functions to guarantee the device stays in
direct mode during raw reads of proximity data.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Reviewed-by: Vlad Dogaru <ddvlad@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/proximity/sx9500.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c index 1f06282ec793..9ea147f1a50d 100644 --- a/drivers/iio/proximity/sx9500.c +++ b/drivers/iio/proximity/sx9500.c @@ -387,14 +387,18 @@ static int sx9500_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct sx9500_data *data = iio_priv(indio_dev); + int ret; switch (chan->type) { case IIO_PROXIMITY: switch (mask) { case IIO_CHAN_INFO_RAW: - if (iio_buffer_enabled(indio_dev)) - return -EBUSY; - return sx9500_read_proximity(data, chan, val); + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + ret = sx9500_read_proximity(data, chan, val); + iio_device_release_direct_mode(indio_dev); + return ret; case IIO_CHAN_INFO_SAMP_FREQ: return sx9500_read_samp_freq(data, val, val2); default: |