aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlison Schofield <amsfield22@gmail.com>2016-07-18 15:34:17 -0400
committerJonathan Cameron <jic23@kernel.org>2016-07-24 14:58:42 -0400
commitd02ec00d00a5eb5e0ca8ef6ddf0a3774adb52b6a (patch)
tree5e018760c1410a572dd6ff385eaed64ba02cc148
parentb4d46409d603ab041bcb1ac9858d076d29e78af8 (diff)
iio: adc: ad7298: 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> Cc: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/adc/ad7298.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index 10ec8fce395f..e399bf04c73a 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -239,16 +239,16 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
239 239
240 switch (m) { 240 switch (m) {
241 case IIO_CHAN_INFO_RAW: 241 case IIO_CHAN_INFO_RAW:
242 mutex_lock(&indio_dev->mlock); 242 ret = iio_device_claim_direct_mode(indio_dev);
243 if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) { 243 if (ret)
244 ret = -EBUSY; 244 return ret;
245 } else { 245
246 if (chan->address == AD7298_CH_TEMP) 246 if (chan->address == AD7298_CH_TEMP)
247 ret = ad7298_scan_temp(st, val); 247 ret = ad7298_scan_temp(st, val);
248 else 248 else
249 ret = ad7298_scan_direct(st, chan->address); 249 ret = ad7298_scan_direct(st, chan->address);
250 } 250
251 mutex_unlock(&indio_dev->mlock); 251 iio_device_release_direct_mode(indio_dev);
252 252
253 if (ret < 0) 253 if (ret < 0)
254 return ret; 254 return ret;