diff options
| author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-10-01 16:59:00 -0400 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-02-08 05:06:22 -0500 |
| commit | f25330f63edd8e2d02ca76ed43fc852d4d76bb12 (patch) | |
| tree | f0b27bfe90a8958df46870f750081d069abadd9f | |
| parent | 6b89db36b3ab7c4b99027873e1de4be8d07387d4 (diff) | |
iio:magnetometer:mag3110: Report busy in _read_raw() / write_raw() when buffer is enabled
individual reads are not permitted concurrently with buffered reads
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/magnetometer/mag3110.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c index 4b65b6d3bdb1..b88cb44f87ce 100644 --- a/drivers/iio/magnetometer/mag3110.c +++ b/drivers/iio/magnetometer/mag3110.c | |||
| @@ -154,6 +154,9 @@ static int mag3110_read_raw(struct iio_dev *indio_dev, | |||
| 154 | 154 | ||
| 155 | switch (mask) { | 155 | switch (mask) { |
| 156 | case IIO_CHAN_INFO_RAW: | 156 | case IIO_CHAN_INFO_RAW: |
| 157 | if (iio_buffer_enabled(indio_dev)) | ||
| 158 | return -EBUSY; | ||
| 159 | |||
| 157 | switch (chan->type) { | 160 | switch (chan->type) { |
| 158 | case IIO_MAGN: /* in 0.1 uT / LSB */ | 161 | case IIO_MAGN: /* in 0.1 uT / LSB */ |
| 159 | ret = mag3110_read(data, buffer); | 162 | ret = mag3110_read(data, buffer); |
| @@ -199,6 +202,9 @@ static int mag3110_write_raw(struct iio_dev *indio_dev, | |||
| 199 | struct mag3110_data *data = iio_priv(indio_dev); | 202 | struct mag3110_data *data = iio_priv(indio_dev); |
| 200 | int rate; | 203 | int rate; |
| 201 | 204 | ||
| 205 | if (iio_buffer_enabled(indio_dev)) | ||
| 206 | return -EBUSY; | ||
| 207 | |||
| 202 | switch (mask) { | 208 | switch (mask) { |
| 203 | case IIO_CHAN_INFO_SAMP_FREQ: | 209 | case IIO_CHAN_INFO_SAMP_FREQ: |
| 204 | rate = mag3110_get_samp_freq_index(data, val, val2); | 210 | rate = mag3110_get_samp_freq_index(data, val, val2); |
