From d39d01768b46ca16f431438b4f1ede85bc20b3e4 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Sun, 4 Dec 2011 20:44:36 +0000
Subject: [PATCH] --- yaml --- r: 281239 b: refs/heads/master c:
 29bf6263af04d9c062693622937d45db014f1d13 h: refs/heads/master i:   281237:
 0f3a8176bc332d6fa17ddf3a65962f8eb640b2ac   281235:
 108ecfadfe585269718ff4a5513468486397d4e7   281231:
 2bd47958f3c7cbe1ed7be2208a9318a69956bf0f v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/iio/adc/max1363_ring.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5dc657a5b378..90cdd8c51af4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 117cf8b7e879a33b24b7bea7ca598715c4654846
+refs/heads/master: 29bf6263af04d9c062693622937d45db014f1d13
diff --git a/trunk/drivers/staging/iio/adc/max1363_ring.c b/trunk/drivers/staging/iio/adc/max1363_ring.c
index a87fbe8b0ee9..3c5e1999cc24 100644
--- a/trunk/drivers/staging/iio/adc/max1363_ring.c
+++ b/trunk/drivers/staging/iio/adc/max1363_ring.c
@@ -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);