staging:iio:adc:max1363 actually make timestamp controllable
authorJonathan Cameron <jic23@cam.ac.uk>
Sun, 4 Dec 2011 20:44:36 +0000 (20:44 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Dec 2011 19:33:18 +0000 (11:33 -0800)
Previously timestamps were always on in this driver.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/iio/adc/max1363_ring.c

index a87fbe8b0ee9700328b2f6c0e9577d6b5830761d..3c5e1999cc24bc641e2403e2d8bd59f95d65369a 100644 (file)
@@ -138,9 +138,8 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
                goto done;
 
        time_ns = iio_get_time_ns();
-
-       memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
-
+       if (indio_dev->buffer->scan_timestamp)
+               memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
        indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns);
 done:
        iio_trigger_notify_done(indio_dev->trig);