Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259993
b: refs/heads/master
c: 85ee35e
h: refs/heads/master
i:
  259991: 19a183a
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Jul 6, 2011
1 parent d4c8b6e commit 6ac3d8d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 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: 7bcf302ff151da6559261bc73e8b9d1ae31cc0bb
refs/heads/master: 85ee35e50d9d416cbe76e8af2b216e1760241400
8 changes: 6 additions & 2 deletions trunk/drivers/staging/iio/accel/adis16201_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,17 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
mutex_lock(&indio_dev->mlock);
addr = adis16201_addresses[chan->address][0];
ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16);
if (ret)
if (ret) {
mutex_unlock(&indio_dev->mlock);
return ret;
}

if (val16 & ADIS16201_ERROR_ACTIVE) {
ret = adis16201_check_status(indio_dev);
if (ret)
if (ret) {
mutex_unlock(&indio_dev->mlock);
return ret;
}
}
val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
if (chan->scan_type.sign == 's')
Expand Down

0 comments on commit 6ac3d8d

Please sign in to comment.