Skip to contentSkip to conversation

patch "iio: hid-sensor-humidity: Fix alignment issue of timestamp channel" added to staging-linus

PATCH [email protected] 1 participant 1 message Mar 15, 2021

Subsystems (3)
Stable branch IIO HID sensor hub drivers
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iio: hid-sensor-humidity: Fix alignment issue of timestamp channel

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From 37e89e574dc238a4ebe439543c5ab4fbb2f0311b Mon Sep 17 00:00:00 2001
From: Ye Xiang <[email protected]>
Date: Wed, 3 Mar 2021 14:36:12 +0800
Subject: iio: hid-sensor-humidity: Fix alignment issue of timestamp channel

This patch ensures that, there is sufficient space and correct alignment for the timestamp.

Fixes d7ed89d5aadf ("iio: hid: Add humidity sensor support")
Signed-off-by Ye Xiang <[email protected]>
Cc <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Jonathan Cameron <[email protected]>
---
 drivers/iio/humidity/hid-sensor-humidity.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/iio/humidity/hid-sensor-humidity.c +7 -5
index 52f605114ef7..d62705448ae2 100644
@@ -15,7 +15,10 @@
 struct hid_humidity_state {
 	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info humidity_attr;
-	s32 humidity_data;
+	struct {
+		s32 humidity_data;
+		u64 timestamp __aligned(8);
+	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
 	int scale_precision;

@@ -125,9 +128,8 @@ static int humidity_proc_event(struct hid_sensor_hub_device *hsdev,
 	struct hid_humidity_state *humid_st = iio_priv(indio_dev);
 
 	if (atomic_read(&humid_st->common_attributes.data_ready))
-		iio_push_to_buffers_with_timestamp(indio_dev,
-					&humid_st->humidity_data,
-					iio_get_time_ns(indio_dev));
+		iio_push_to_buffers_with_timestamp(indio_dev, &humid_st->scan,
+						   iio_get_time_ns(indio_dev));
 
 	return 0;
 }

@@ -142,7 +144,7 @@ static int humidity_capture_sample(struct hid_sensor_hub_device *hsdev,
 
 	switch (usage_id) {
 	case HID_USAGE_SENSOR_ATMOSPHERIC_HUMIDITY:
-		humid_st->humidity_data = *(s32 *)raw_data;
+		humid_st->scan.humidity_data = *(s32 *)raw_data;
 
 		return 0;
 	default:
Signature · 1 line
2.30.2