| From 4512fff58e9048cb542b607c683c8d5a0191662c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 13 Jun 2021 16:22:57 +0100 |
| Subject: iio: adc: ti-ads8688: Fix alignment of buffer in |
| iio_push_to_buffers_with_timestamp() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| |
| [ Upstream commit 61fa5dfa5f52806f5ce37a0ba5712c271eb22f98 ] |
| |
| Add __aligned(8) to ensure the buffer passed to |
| iio_push_to_buffers_with_timestamp() is suitable for the naturally |
| aligned timestamp that will be inserted. |
| |
| Fixes: f214ff521fb1 ("iio: ti-ads8688: Update buffer allocation for timestamps") |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Reviewed-by: Nuno Sรก <nuno.sa@analog.com> |
| Link: https://lore.kernel.org/r/20210613152301.571002-5-jic23@kernel.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iio/adc/ti-ads8688.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c |
| index 16bcb37eebb7..79c803537dc4 100644 |
| --- a/drivers/iio/adc/ti-ads8688.c |
| +++ b/drivers/iio/adc/ti-ads8688.c |
| @@ -383,7 +383,8 @@ static irqreturn_t ads8688_trigger_handler(int irq, void *p) |
| { |
| struct iio_poll_func *pf = p; |
| struct iio_dev *indio_dev = pf->indio_dev; |
| - u16 buffer[ADS8688_MAX_CHANNELS + sizeof(s64)/sizeof(u16)]; |
| + /* Ensure naturally aligned timestamp */ |
| + u16 buffer[ADS8688_MAX_CHANNELS + sizeof(s64)/sizeof(u16)] __aligned(8); |
| int i, j = 0; |
| |
| for (i = 0; i < indio_dev->masklength; i++) { |
| -- |
| 2.30.2 |
| |