xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: prox: pulsed-light: Fix buffer alignment in iio_push_to_buffers_with_timestamp()

Browse Source 
[ Upstream commit 679cc377a03ff1944491eafc7355c1eb1fad4109 ]

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: cb119d5350 ("iio: proximity: add support for PulsedLight LIDAR")
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Matt Ranostay <matt.ranostay@konsulko.com>
Acked-by: Matt Ranostay <matt.ranostay@konsulko.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210501170121.512209-14-jic23@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jonathan Cameron
2021-05-01 18:01:15 +01:00
committed by Greg Kroah-Hartman
parent 8e23dd6236
commit ab16be53b2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
View File

@@ -44,7 +44,11 @@ struct lidar_data {
int (*xfer)(struct lidar_data *data, u8 reg, u8 *val, int len); int (*xfer)(struct lidar_data *data, u8 reg, u8 *val, int len);
int i2c_enabled; int i2c_enabled;
u16 buffer[8]; /* 2 byte distance + 8 byte timestamp */ /* Ensure timestamp is naturally aligned */
struct {
u16 chan;
s64 timestamp __aligned(8);
} scan;
}; };
static const struct iio_chan_spec lidar_channels[] = { static const struct iio_chan_spec lidar_channels[] = {
@@ -230,9 +234,9 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private)
struct lidar_data *data = iio_priv(indio_dev); struct lidar_data *data = iio_priv(indio_dev);
int ret; int ret;
ret = lidar_get_measurement(data, data->buffer); ret = lidar_get_measurement(data, &data->scan.chan);
if (!ret) { if (!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)); iio_get_time_ns(indio_dev));
} else if (ret != -EINVAL) { } else if (ret != -EINVAL) {
dev_err(&data->client->dev, "cannot read LIDAR measurement"); dev_err(&data->client->dev, "cannot read LIDAR measurement");