| From 39ecfee428dcfaecbafe1a171fcfee6b7be44e1d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 1 May 2021 18:01:20 +0100 |
| Subject: iio: light: tcs3414: Fix buffer alignment in |
| iio_push_to_buffers_with_timestamp() |
| |
| From: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| |
| [ Upstream commit ff08fbc22ab32ccc6690c21b0e5e1d402dcc076f ] |
| |
| To make code more readable, use a structure to express the channel |
| layout and ensure the timestamp is 8 byte aligned. |
| |
| Found during an audit of all calls of uses of |
| iio_push_to_buffers_with_timestamp() |
| |
| Fixes: a244e7b57f0f ("iio: Add driver for AMS/TAOS tcs3414 digital color sensor") |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> |
| Link: https://lore.kernel.org/r/20210501170121.512209-19-jic23@kernel.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iio/light/tcs3414.c | 10 +++++++--- |
| 1 file changed, 7 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c |
| index 6fe5d46f80d4..0593abd600ec 100644 |
| --- a/drivers/iio/light/tcs3414.c |
| +++ b/drivers/iio/light/tcs3414.c |
| @@ -53,7 +53,11 @@ struct tcs3414_data { |
| u8 control; |
| u8 gain; |
| u8 timing; |
| - u16 buffer[8]; /* 4x 16-bit + 8 bytes timestamp */ |
| + /* Ensure timestamp is naturally aligned */ |
| + struct { |
| + u16 chans[4]; |
| + s64 timestamp __aligned(8); |
| + } scan; |
| }; |
| |
| #define TCS3414_CHANNEL(_color, _si, _addr) { \ |
| @@ -209,10 +213,10 @@ static irqreturn_t tcs3414_trigger_handler(int irq, void *p) |
| if (ret < 0) |
| goto done; |
| |
| - data->buffer[j++] = ret; |
| + data->scan.chans[j++] = ret; |
| } |
| |
| - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, |
| + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, |
| iio_get_time_ns(indio_dev)); |
| |
| done: |
| -- |
| 2.30.2 |
| |