diff options
| author | Alison Schofield <amsfield22@gmail.com> | 2016-05-24 12:18:43 -0700 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-05-29 19:36:01 +0100 |
| commit | 6fea8a426b67455a58b59964cee905754ab77497 (patch) | |
| tree | 4d16bf23863506904fa7b20669ffea7199718667 | |
| parent | a52f238e7c808d9fd1f9dfc675f583b77156cdeb (diff) | |
| download | linux-stable-6fea8a426b67455a58b59964cee905754ab77497.tar.gz linux-stable-6fea8a426b67455a58b59964cee905754ab77497.tar.bz2 linux-stable-6fea8a426b67455a58b59964cee905754ab77497.zip | |
iio: adc: ad7887: use iio helper function to guarantee direct mode
Replace the code that guarantees the device stays in direct mode
with iio_device_claim_direct_mode() which does same.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/adc/ad7887.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c index 2d3c397e66ad..ee2ccc19fab6 100644 --- a/drivers/iio/adc/ad7887.c +++ b/drivers/iio/adc/ad7887.c @@ -156,12 +156,11 @@ static int ad7887_read_raw(struct iio_dev *indio_dev, switch (m) { case IIO_CHAN_INFO_RAW: - mutex_lock(&indio_dev->mlock); - if (iio_buffer_enabled(indio_dev)) - ret = -EBUSY; - else - ret = ad7887_scan_direct(st, chan->address); - mutex_unlock(&indio_dev->mlock); + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + ret = ad7887_scan_direct(st, chan->address); + iio_device_release_direct_mode(indio_dev); if (ret < 0) return ret; |