Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / iio / accel / bma180.c

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index e3f88ba5faf33ff4b7179fb96f603d20875f77a6..0890934ef66f66bca02521ffe71192591afe3aa5 100644 (file)
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -469,13 +469,14 @@ static int bma180_read_raw(struct iio_dev *indio_dev,
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
+               ret = iio_device_claim_direct_mode(indio_dev);
+               if (ret)
+                       return ret;
+
                mutex_lock(&data->mutex);
-               if (iio_buffer_enabled(indio_dev)) {
-                       mutex_unlock(&data->mutex);
-                       return -EBUSY;
-               }
                ret = bma180_get_data_reg(data, chan->scan_index);
                mutex_unlock(&data->mutex);
+               iio_device_release_direct_mode(indio_dev);
                if (ret < 0)
                        return ret;
                *val = sign_extend32(ret >> chan->scan_type.shift,