| From 76552d634e95a870d0d1474d2df70b20535a5578 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 13 Jun 2021 16:22:55 +0100 |
| Subject: iio: adc: hx711: Fix buffer alignment in |
| iio_push_to_buffers_with_timestamp() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| |
| [ Upstream commit afe2a789fbf7acd1a05407fc7839cc08d23825e3 ] |
| |
| 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 this function. |
| |
| Fixes: d3bf60450d47 ("iio: hx711: add triggered buffer support") |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Cc: Andreas Klinger <ak@it-klinger.de> |
| Reviewed-by: Nuno Sรก <nuno.sa@analog.com> |
| Link: https://lore.kernel.org/r/20210613152301.571002-3-jic23@kernel.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iio/adc/hx711.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c |
| index 6a173531d355..f7ee856a6b8b 100644 |
| --- a/drivers/iio/adc/hx711.c |
| +++ b/drivers/iio/adc/hx711.c |
| @@ -86,9 +86,9 @@ struct hx711_data { |
| struct mutex lock; |
| /* |
| * triggered buffer |
| - * 2x32-bit channel + 64-bit timestamp |
| + * 2x32-bit channel + 64-bit naturally aligned timestamp |
| */ |
| - u32 buffer[4]; |
| + u32 buffer[4] __aligned(8); |
| /* |
| * delay after a rising edge on SCK until the data is ready DOUT |
| * this is dependent on the hx711 where the datasheet tells a |
| -- |
| 2.30.2 |
| |
