Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304371
b: refs/heads/master
c: 967d3fe
h: refs/heads/master
i:
  304369: e6d0958
  304367: 42343a3
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Apr 18, 2012
1 parent bd1594e commit c8e29a0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6246577071ac4b29579203e7c22a7f383cf4f9e8
refs/heads/master: 967d3fe0dc84ac26380e8c9d916d90e1977a75d8
10 changes: 7 additions & 3 deletions trunk/drivers/staging/iio/impedance-analyzer/ad5933.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ static struct iio_chan_spec ad5933_channels[] = {
.indexed = 1,
.processed_val = 1,
.channel = 0,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
.address = AD5933_REG_TEMP_DATA,
.scan_type = {
.sign = 's',
Expand All @@ -125,7 +126,8 @@ static struct iio_chan_spec ad5933_channels[] = {
.indexed = 1,
.channel = 0,
.extend_name = "real_raw",
.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
.address = AD5933_REG_REAL_DATA,
.scan_index = 0,
.scan_type = {
Expand All @@ -138,7 +140,8 @@ static struct iio_chan_spec ad5933_channels[] = {
.indexed = 1,
.channel = 0,
.extend_name = "imag_raw",
.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
.address = AD5933_REG_IMAG_DATA,
.scan_index = 1,
.scan_type = {
Expand Down Expand Up @@ -524,7 +527,8 @@ static int ad5933_read_raw(struct iio_dev *indio_dev,

mutex_lock(&indio_dev->mlock);
switch (m) {
case 0:
case IIO_CHAN_INFO_RAW:
case IIO_CHAN_INFO_PROCESSED:
if (iio_buffer_enabled(indio_dev)) {
ret = -EBUSY;
goto out;
Expand Down

0 comments on commit c8e29a0

Please sign in to comment.