summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/adc/ad7887_ring.c
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2012-04-21 10:09:44 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-24 11:23:38 -0700
commitfd6487f8439f7859acf17589f1d612285b5c0fa5 (patch)
tree8cad7b136286c3e0c4c818db44a0799a86e3a6c4 /drivers/staging/iio/adc/ad7887_ring.c
parentf5ee7b807fc90756d6852690a3777db7093efe0d (diff)
downloadop-kernel-dev-fd6487f8439f7859acf17589f1d612285b5c0fa5.zip
op-kernel-dev-fd6487f8439f7859acf17589f1d612285b5c0fa5.tar.gz
staging:iio: Add caching of scan_timestamp to the core as well as buffers.
This will be needed when multiple buffer support is added. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/adc/ad7887_ring.c')
-rw-r--r--drivers/staging/iio/adc/ad7887_ring.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
index 442994e..62681a8 100644
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -72,7 +72,6 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev;
struct ad7887_state *st = iio_priv(indio_dev);
- struct iio_buffer *ring = indio_dev->buffer;
s64 time_ns;
__u8 *buf;
int b_sent;
@@ -92,7 +91,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
time_ns = iio_get_time_ns();
memcpy(buf, st->data, bytes);
- if (ring->scan_timestamp)
+ if (indio_dev->scan_timestamp)
memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
&time_ns, sizeof(time_ns));
OpenPOWER on IntegriCloud