summaryrefslogtreecommitdiffstats
path: root/drivers/iio/common
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-10-21 08:42:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-10-21 08:42:22 +0200
commitd723c456ef5ad60d368e62791004fd152c4380aa (patch)
treee517740ce6685407ead9cf300c93fd6c2b5df451 /drivers/iio/common
parentffb4b4ed3e8f4782072ff03513f3531be6b2d3a7 (diff)
parent42f7652d3eb527d03665b09edac47f85fb600924 (diff)
downloadlinux-stable-d723c456ef5ad60d368e62791004fd152c4380aa.tar.gz
linux-stable-d723c456ef5ad60d368e62791004fd152c4380aa.tar.bz2
linux-stable-d723c456ef5ad60d368e62791004fd152c4380aa.zip
Merge 6.12-rc4 into char-misc-next
We need the iio fixes from 6.12-rc4 in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/common')
-rw-r--r--drivers/iio/common/hid-sensors/hid-sensor-trigger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index ad8910e6ad59..abb09fefc792 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -32,7 +32,7 @@ static ssize_t _hid_sensor_set_report_latency(struct device *dev,
latency = integer * 1000 + fract / 1000;
ret = hid_sensor_set_report_latency(attrb, latency);
if (ret < 0)
- return len;
+ return ret;
attrb->latency_ms = hid_sensor_get_report_latency(attrb);