aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <Jonathan.Cameron@huawei.com>2021-06-13 16:22:55 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-14 16:56:44 +0200
commita6a1e347c7a0106de4b73b76312b008c128f4620 (patch)
tree8ef027b099e1c9a94a8b35e5aa0de0119bd195ad
parent2abfdd61324cb51a8bc2ae0445a91f21095fdb1f (diff)
downloadkernel_replicant_linux-a6a1e347c7a0106de4b73b76312b008c128f4620.tar.gz
kernel_replicant_linux-a6a1e347c7a0106de4b73b76312b008c128f4620.tar.bz2
kernel_replicant_linux-a6a1e347c7a0106de4b73b76312b008c128f4620.zip
iio: adc: hx711: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
[ 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>
-rw-r--r--drivers/iio/adc/hx711.c4
1 files 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