From d156c1d2a72877238554276343a835d72a72a929 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 19 Dec 2011 15:23:43 +0100 Subject: [PATCH] --- yaml --- r: 281418 b: refs/heads/master c: 5fd6218ca5928e4b59eb8a496aa1428fae1fb0d6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/industrialio-buffer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 44c59c8e7153..cc933ab77986 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4a6882e1b9f01fa5bf7bb695081133121106dbb +refs/heads/master: 5fd6218ca5928e4b59eb8a496aa1428fae1fb0d6 diff --git a/trunk/drivers/staging/iio/industrialio-buffer.c b/trunk/drivers/staging/iio/industrialio-buffer.c index 36993038b261..747b9013a666 100644 --- a/trunk/drivers/staging/iio/industrialio-buffer.c +++ b/trunk/drivers/staging/iio/industrialio-buffer.c @@ -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; } @@ -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; }