moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio: gyro: bmg160: Fix buffer alignment in iio_push_to_buffers_with_timestamp()

Browse Source 
[ Upstream commit 06778d881f ]

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: 13426454b6 ("iio: bmg160: Separate i2c and core driver")
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210501170121.512209-11-jic23@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jonathan Cameron
2021-05-01 18:01:12 +01:00
committed by Greg Kroah-Hartman
parent 718a67a909
commit 8ea878287c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iio/gyro/bmg160_core.c
View File

@@ -96,7 +96,11 @@ struct bmg160_data {
struct iio_trigger *motion_trig; struct iio_trigger *motion_trig;
struct iio_mount_matrix orientation; struct iio_mount_matrix orientation;
struct mutex mutex; struct mutex mutex;
s16 buffer[8]; /* Ensure naturally aligned timestamp */
struct {
s16 chans[3];
s64 timestamp __aligned(8);
} scan;
u32 dps_range; u32 dps_range;
int ev_enable_state; int ev_enable_state;
int slope_thres; int slope_thres;
@@ -880,12 +884,12 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
ret = regmap_bulk_read(data->regmap, BMG160_REG_XOUT_L, ret = regmap_bulk_read(data->regmap, BMG160_REG_XOUT_L,
data->buffer, AXIS_MAX * 2); data->scan.chans, AXIS_MAX * 2);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
if (ret < 0) if (ret < 0)
goto err; goto err;
iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
pf->timestamp); pf->timestamp);
err: err:
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);