From ee14fadd665e4943432ca399dcccf77363a5bfc4 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 15 Nov 2012 13:15:00 +0000
Subject: [PATCH] --- yaml --- r: 338006 b: refs/heads/master c:
 ca654638f2b4b00f948d2126dd544d2e35d2b880 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/iio/adc/ad7298.h      |  2 +-
 trunk/drivers/staging/iio/adc/ad7298_core.c |  1 +
 trunk/drivers/staging/iio/adc/ad7298_ring.c | 11 +++--------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 18ec926352cf..c5a14c9eb248 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec04cb048d79cd778c06e28f34395a46d774800d
+refs/heads/master: ca654638f2b4b00f948d2126dd544d2e35d2b880
diff --git a/trunk/drivers/staging/iio/adc/ad7298.h b/trunk/drivers/staging/iio/adc/ad7298.h
index 18f278723002..0ce9031bec90 100644
--- a/trunk/drivers/staging/iio/adc/ad7298.h
+++ b/trunk/drivers/staging/iio/adc/ad7298.h
@@ -48,7 +48,7 @@ struct ad7298_state {
 	 * DMA (thus cache coherency maintenance) requires the
 	 * transfer buffers to live in their own cache lines.
 	 */
-	unsigned short			rx_buf[8] ____cacheline_aligned;
+	unsigned short			rx_buf[12] ____cacheline_aligned;
 	unsigned short			tx_buf[2];
 };
 
diff --git a/trunk/drivers/staging/iio/adc/ad7298_core.c b/trunk/drivers/staging/iio/adc/ad7298_core.c
index 4c75114e7d7c..67082ade1850 100644
--- a/trunk/drivers/staging/iio/adc/ad7298_core.c
+++ b/trunk/drivers/staging/iio/adc/ad7298_core.c
@@ -35,6 +35,7 @@
 			.sign = 'u',					\
 			.realbits = 12,					\
 			.storagebits = 16,				\
+			.endianness = IIO_BE,				\
 		},							\
 	}
 
diff --git a/trunk/drivers/staging/iio/adc/ad7298_ring.c b/trunk/drivers/staging/iio/adc/ad7298_ring.c
index b3dd514b9627..e3877129222b 100644
--- a/trunk/drivers/staging/iio/adc/ad7298_ring.c
+++ b/trunk/drivers/staging/iio/adc/ad7298_ring.c
@@ -76,8 +76,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
 	struct iio_dev *indio_dev = pf->indio_dev;
 	struct ad7298_state *st = iio_priv(indio_dev);
 	s64 time_ns = 0;
-	__u16 buf[16];
-	int b_sent, i;
+	int b_sent;
 
 	b_sent = spi_sync(st->spi, &st->ring_msg);
 	if (b_sent)
@@ -85,15 +84,11 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
 
 	if (indio_dev->scan_timestamp) {
 		time_ns = iio_get_time_ns();
-		memcpy((u8 *)buf + indio_dev->scan_bytes - sizeof(s64),
+		memcpy((u8 *)st->rx_buf + indio_dev->scan_bytes - sizeof(s64),
 			&time_ns, sizeof(time_ns));
 	}
 
-	for (i = 0; i < bitmap_weight(indio_dev->active_scan_mask,
-						 indio_dev->masklength); i++)
-		buf[i] = be16_to_cpu(st->rx_buf[i]);
-
-	iio_push_to_buffers(indio_dev, (u8 *)buf);
+	iio_push_to_buffers(indio_dev, (u8 *)st->rx_buf);
 
 done:
 	iio_trigger_notify_done(indio_dev->trig);