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

iio: prox: srf08: Fix buffer alignment in iio_push_to_buffers_with_timestamp()

Browse Source 
[ Upstream commit 19f1a254fe4949fff1e67db386409f48cf438bd7 ]

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: 78f839029e ("iio: distance: srf08: add IIO driver for us ranger")
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Andreas Klinger <ak@it-klinger.de>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210501170121.512209-13-jic23@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jonathan Cameron
2021-05-01 18:01:14 +01:00
committed by Greg Kroah-Hartman
parent c61ac1f83b
commit 8e23dd6236
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/iio/proximity/srf08.c
View File

@@ -63,11 +63,11 @@ struct srf08_data {
int range_mm; int range_mm;
struct mutex lock; struct mutex lock;
/* /* Ensure timestamp is naturally aligned */
* triggered buffer struct {
* 1x16-bit channel + 3x16 padding + 4x16 timestamp s16 chan;
*/ s64 timestamp __aligned(8);
s16 buffer[8]; } scan;
/* Sensor-Type */ /* Sensor-Type */
enum srf08_sensor_type sensor_type; enum srf08_sensor_type sensor_type;
@@ -190,9 +190,9 @@ static irqreturn_t srf08_trigger_handler(int irq, void *p)
mutex_lock(&data->lock); mutex_lock(&data->lock);
data->buffer[0] = sensor_data; data->scan.chan = sensor_data;
iio_push_to_buffers_with_timestamp(indio_dev, iio_push_to_buffers_with_timestamp(indio_dev,
data->buffer, pf->timestamp); &data->scan, pf->timestamp);
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
err: err: