Commit b78d0742 authored May 01, 2021 by Jonathan Cameron Committed by Greg Kroah-Hartman Jul 20, 2021

iio: light: tcs3414: Fix buffer alignment in iio_push_to_buffers_with_timestamp()



[ 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: a244e7b5 ("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>

parent a0c5fd8b

drivers/iio/light/tcs3414.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -56,7 +56,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) { \
		@@ -212,10 +216,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: