Commit 6b2e7589 authored by Alison Schofield's avatar Alison Schofield Committed by Jonathan Cameron

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: default avatarAlison Schofield <amsfield22@gmail.com>
Reviewed-by: default avatarVlad Dogaru <ddvlad@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 80dea21f
...@@ -387,14 +387,18 @@ static int sx9500_read_raw(struct iio_dev *indio_dev, ...@@ -387,14 +387,18 @@ static int sx9500_read_raw(struct iio_dev *indio_dev,
int *val, int *val2, long mask) int *val, int *val2, long mask)
{ {
struct sx9500_data *data = iio_priv(indio_dev); struct sx9500_data *data = iio_priv(indio_dev);
int ret;
switch (chan->type) { switch (chan->type) {
case IIO_PROXIMITY: case IIO_PROXIMITY:
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
if (iio_buffer_enabled(indio_dev)) ret = iio_device_claim_direct_mode(indio_dev);
return -EBUSY; if (ret)
return sx9500_read_proximity(data, chan, val); return ret;
ret = sx9500_read_proximity(data, chan, val);
iio_device_release_direct_mode(indio_dev);
return ret;
case IIO_CHAN_INFO_SAMP_FREQ: case IIO_CHAN_INFO_SAMP_FREQ:
return sx9500_read_samp_freq(data, val, val2); return sx9500_read_samp_freq(data, val, val2);
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment