1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/iio/adc/ti-ads124s08.c b/drivers/iio/adc/ti-ads124s08.c
index 4b4fbe33930c..b4a128b19188 100644
--- a/drivers/iio/adc/ti-ads124s08.c
+++ b/drivers/iio/adc/ti-ads124s08.c
@@ -99,6 +99,14 @@ struct ads124s_private {
         struct gpio_desc *reset_gpio;
         struct spi_device *spi;
         struct mutex lock;
+        /*
+         * Used to correctly align data.
+         * Ensure timestamp is naturally aligned.
+         * Note that the full buffer length may not be needed if not
+         * all channels are enabled, as long as the alignment of the
+         * timestamp is maintained.
+         */
+        u32 buffer[ADS124S08_MAX_CHANNELS + sizeof(s64)/sizeof(u32)] __aligned(8);
         u8 data[5] ____cacheline_aligned;
 };
 
@@ -269,7 +277,6 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
         struct ads124s_private *priv = iio_priv(indio_dev);
-        u32 buffer[ADS124S08_MAX_CHANNELS + sizeof(s64)/sizeof(u16)];
         int scan_index, j = 0;
         int ret;
 
@@ -284,7 +291,7 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
                 if (ret)
                         dev_err(&priv->spi->dev, "Start ADC conversions failed\n");
 
-                buffer[j] = ads124s_read(indio_dev, scan_index);
+                priv->buffer[j] = ads124s_read(indio_dev, scan_index);
                 ret = ads124s_write_cmd(indio_dev, ADS124S08_STOP_CONV);
                 if (ret)
                         dev_err(&priv->spi->dev, "Stop ADC conversions failed\n");
@@ -292,7 +299,7 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
                 j++;
         }
 
-        iio_push_to_buffers_with_timestamp(indio_dev, buffer,
+        iio_push_to_buffers_with_timestamp(indio_dev, priv->buffer,
                         pf->timestamp);
 
         iio_trigger_notify_done(indio_dev->trig);