From d9f9cd77eff253c64d6562cdebe0d0d45c15716a Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Mon, 5 Dec 2011 21:37:11 +0000 Subject: [PATCH] --- yaml --- r: 281244 b: refs/heads/master c: beb80600b017ff4c407e9e72eb7f9a884fed4210 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/buffer.h | 1 + trunk/drivers/staging/iio/industrialio-buffer.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9671f21092b5..1904d7ad85d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fb21c824e8ff22ae9361a789e8b845d72ae0557 +refs/heads/master: beb80600b017ff4c407e9e72eb7f9a884fed4210 diff --git a/trunk/drivers/staging/iio/buffer.h b/trunk/drivers/staging/iio/buffer.h index 9de581e2d764..4b8f6190a5b0 100644 --- a/trunk/drivers/staging/iio/buffer.h +++ b/trunk/drivers/staging/iio/buffer.h @@ -106,6 +106,7 @@ struct iio_buffer { int scan_count; long *scan_mask; bool scan_timestamp; + unsigned scan_index_timestamp; const struct iio_buffer_access_funcs *access; const struct iio_buffer_setup_ops *setup_ops; struct list_head scan_el_dev_attr_list; diff --git a/trunk/drivers/staging/iio/industrialio-buffer.c b/trunk/drivers/staging/iio/industrialio-buffer.c index 8c5598081b60..b2cf3e33e39b 100644 --- a/trunk/drivers/staging/iio/industrialio-buffer.c +++ b/trunk/drivers/staging/iio/industrialio-buffer.c @@ -313,6 +313,9 @@ int iio_buffer_register(struct iio_dev *indio_dev, if (ret < 0) goto error_cleanup_dynamic; attrcount += ret; + if (channels[i].type == IIO_TIMESTAMP) + buffer->scan_index_timestamp = + channels[i].scan_index; } if (indio_dev->masklength && buffer->scan_mask == NULL) { buffer->scan_mask = kcalloc(BITS_TO_LONGS(indio_dev->masklength),