Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281418
b: refs/heads/master
c: 5fd6218
h: refs/heads/master
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Dec 22, 2011
1 parent 85eb6a3 commit d156c1d
Show file tree
Hide file tree
Showing 2 changed files with 3 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: d4a6882e1b9f01fa5bf7bb695081133121106dbb
refs/heads/master: 5fd6218ca5928e4b59eb8a496aa1428fae1fb0d6
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/industrialio-buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static ssize_t iio_scan_el_store(struct device *dev,

state = !(buf[0] == '0');
mutex_lock(&indio_dev->mlock);
if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
if (iio_buffer_enabled(indio_dev)) {
ret = -EBUSY;
goto error_ret;
}
Expand Down Expand Up @@ -196,7 +196,7 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,

state = !(buf[0] == '0');
mutex_lock(&indio_dev->mlock);
if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
if (iio_buffer_enabled(indio_dev)) {
ret = -EBUSY;
goto error_ret;
}
Expand Down

0 comments on commit d156c1d

Please sign in to comment.