Skip to content

Commit

Permalink
iio: light: tcs3414: Fix buffer alignment in iio_push_to_buffers_with…
Browse files Browse the repository at this point in the history
…_timestamp()

[ Upstream commit ff08fbc ]

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: a244e7b ("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>
  • Loading branch information
jic23 authored and gregkh committed Jul 14, 2021
1 parent 293b824 commit daecb8c
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/iio/light/tcs3414.c
Expand Up @@ -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) { \
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit daecb8c

Please sign in to comment.