Skip to contentSkip to conversation

iio: hid: fix the retval in [accel|gyro]_3d_capture_sample

PATCH Applied Dmitry Perchanov 2 participants 4 messages Jan 2, 2023 – Jan 9, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: hid: fix the retval in [accel|gyro]_3d_capture_sample

From d12f607f83c0bdae6529d8cfbb0cf17f8920c380 Mon Sep 17 00:00:00 2001
From: Dmitry Perchanov <[email protected]>
Date: Tue, 13 Dec 2022 17:44:01 +0200
Subject: [PATCH] iio: hid: fix the retval in [accel|gyro]_3d_capture_sample

Return value should be zero for success.
This was forgotten for timestamp feature.
Verified on RealSense cameras.

---
 drivers/iio/accel/hid-sensor-accel-3d.c | 1 +
 drivers/iio/gyro/hid-sensor-gyro-3d.c   | 1 +
 2 files changed, 2 insertions(+)
drivers/iio/accel/hid-sensor-accel-3d.c +1 -0
index a2def6f93..5eac7ea19 100644
@@ -280,6 +280,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 			hid_sensor_convert_timestamp(
 					&accel_state->common_attributes,
 					*(int64_t *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;
drivers/iio/gyro/hid-sensor-gyro-3d.c +1 -0
index 8f0ad022c..698c50da1 100644
@@ -231,6 +231,7 @@ static int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 		gyro_state->timestamp =
 			hid_sensor_convert_timestamp(&gyro_state->common_attributes,
 						     *(s64 *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;
Signature · 10 lines
2.39.0


---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
maintainer Applied
#1 lore raw
Quoted 10 lines · On Mon, 02 Jan 2023 20:51:27 +0200 Dmitry Perchanov…

From d12f607f83c0bdae6529d8cfbb0cf17f8920c380 Mon Sep 17 00:00:00 2001
From: Dmitry Perchanov <[email protected]>
Date: Tue, 13 Dec 2022 17:44:01 +0200
Subject: [PATCH] iio: hid: fix the retval in [accel|gyro]_3d_capture_sample

Return value should be zero for success.
This was forgotten for timestamp feature.
Verified on RealSense cameras.

Hi Dmitry,

I've taken this as it stands (needed to do a bit of hand editing to get git to accept your email). However, if you fancy doing some cleanup it would be better still if these functions just returned directly in each arm of the switch statement. Drop the final return and the compiler will moan if any path is not covered...

Applied to the fixes-togreg branch of iio.git and marked for stable inclusion.

Thanks,

Jonathan

Quoted 29 lines
---
 drivers/iio/accel/hid-sensor-accel-3d.c | 1 +
 drivers/iio/gyro/hid-sensor-gyro-3d.c   | 1 +
 2 files changed, 2 insertions(+)
drivers/iio/accel/hid-sensor-accel-3d.c +1 -0
index a2def6f93..5eac7ea19 100644
@@ -280,6 +280,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 			hid_sensor_convert_timestamp(
 					&accel_state->common_attributes,
 					*(int64_t *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;
drivers/iio/gyro/hid-sensor-gyro-3d.c +1 -0
index 8f0ad022c..698c50da1 100644
@@ -231,6 +231,7 @@ static int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 		gyro_state->timestamp =
 			hid_sensor_convert_timestamp(&gyro_state->common_attributes,
 						     *(s64 *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;
maintainer
#2 lore raw
Quoted 7 lines · On Sun, 8 Jan 2023 12:24:34 +0000 Jonathan Cameron <[email protected]> wrote:
Quoted 4 lines · On Mon, 02 Jan 2023 20:51:27 +0200 Dmitry Perchanov…

From d12f607f83c0bdae6529d8cfbb0cf17f8920c380 Mon Sep 17 00:00:00 2001
From: Dmitry Perchanov <[email protected]>
Date: Tue, 13 Dec 2022 17:44:01 +0200
Subject: [PATCH] iio: hid: fix the retval in [accel|gyro]_3d_capture_sample

This block shouldn't be here in the email.

Quoted 8 lines
Quoted 6 lines

Return value should be zero for success.
This was forgotten for timestamp feature.
Verified on RealSense cameras.

Hi Dmitry,

Quoted 7 lines

I've taken this as it stands (needed to do a bit of hand editing to get git to accept your email). However, if you fancy doing some cleanup it would be better still if these functions just returned directly in each arm of the switch statement. Drop the final return and the compiler will moan if any path is not covered...

Applied to the fixes-togreg branch of iio.git and marked for stable inclusion.

Actually, whilst applying I tried to add a fixes tag with the assumption these were probably both added at a similar time. Unfortunately not (one was 2021, the other 2016).

As such I've dropped the patch. Could you resend this as two separate patches, with fixes tags as appropriate.

Fixes 4648cbd8fb92 ("iio: hid-sensor-gyro-3d: Add timestamp channel")
Fixes a96cd0f901ee ("iio: accel: hid-sensor-accel-3d: Add timestamp")

This is a fix we definitely want backported, so making it easy to do is important.

Thanks,

Jonathan

Quoted 35 lines

Thanks,

Jonathan

Quoted 29 lines
---
 drivers/iio/accel/hid-sensor-accel-3d.c | 1 +
 drivers/iio/gyro/hid-sensor-gyro-3d.c   | 1 +
 2 files changed, 2 insertions(+)
drivers/iio/accel/hid-sensor-accel-3d.c +1 -0
index a2def6f93..5eac7ea19 100644
@@ -280,6 +280,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 			hid_sensor_convert_timestamp(
 					&accel_state->common_attributes,
 					*(int64_t *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;
drivers/iio/gyro/hid-sensor-gyro-3d.c +1 -0
index 8f0ad022c..698c50da1 100644
@@ -231,6 +231,7 @@ static int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 		gyro_state->timestamp =
 			hid_sensor_convert_timestamp(&gyro_state->common_attributes,
 						     *(s64 *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;  
#3 lore raw
Quoted 30 lines · Jonathan Cameron
Quoted 7 lines · On Sun, 8 Jan 2023 12:24:34 +0000 Jonathan Cameron <[email protected]> wrote:
Quoted 4 lines · On Mon, 02 Jan 2023 20:51:27 +0200 Dmitry Perchanov…

From d12f607f83c0bdae6529d8cfbb0cf17f8920c380 Mon Sep 17 00:00:00 2001
From: Dmitry Perchanov <[email protected]>
Date: Tue, 13 Dec 2022 17:44:01 +0200
Subject: [PATCH] iio: hid: fix the retval in [accel|gyro]_3d_capture_sample

This block shouldn't be here in the email.

Quoted 9 lines
Quoted 6 lines

Return value should be zero for success.
This was forgotten for timestamp feature.
Verified on RealSense cameras.

Hi Dmitry,

Quoted 7 lines

I've taken this as it stands (needed to do a bit of hand editing to get git to accept your email). However, if you fancy doing some cleanup it would be better still if these functions just returned directly in each arm of the switch statement. Drop the final return and the compiler will moan if any path is not covered...

Applied to the fixes-togreg branch of iio.git and marked for stable inclusion.

Quoted 9 lines

Actually, whilst applying I tried to add a fixes tag with the assumption these were probably both added at a similar time. Unfortunately not (one was 2021, the other 2016).

As such I've dropped the patch. Could you resend this as two separate patches, with fixes tags as appropriate.

Fixes 4648cbd8fb92 ("iio: hid-sensor-gyro-3d: Add timestamp channel")
Fixes a96cd0f901ee ("iio: accel: hid-sensor-accel-3d: Add timestamp")

I will resend two separate patches.

Thanks,

Dmitry

Quoted 34 lines

This is a fix we definitely want backported, so making it easy to do is important.

Thanks,

Jonathan

Quoted 26 lines

Thanks,

Jonathan

Quoted 21 lines
---
 drivers/iio/accel/hid-sensor-accel-3d.c | 1 +
 drivers/iio/gyro/hid-sensor-gyro-3d.c   | 1 +
 2 files changed, 2 insertions(+)
drivers/iio/accel/hid-sensor-accel-3d.c +1 -0
index a2def6f93..5eac7ea19 100644
@@ -280,6 +280,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 			hid_sensor_convert_timestamp(
 					&accel_state->common_attributes,
 					*(int64_t *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;
drivers/iio/gyro/hid-sensor-gyro-3d.c +0 -0
index 8f0ad022c..698c50da1 100644
Quoted 10 lines
Quoted 8 lines

drivers/iio/gyro/hid-sensor-gyro-3d.c static int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev, · line 237

Quoted 8 lines
drivers/iio/gyro/hid-sensor-gyro-3d.c +1 -0
@@ -231,6 +231,7 @@ static int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
 		gyro_state->timestamp =
 			hid_sensor_convert_timestamp(&gyro_state->common_attributes,
 						     *(s64 *)raw_data);
+		ret = 0;
 	break;
 	default:
 		break;  

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.