]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
iio: light: opt3001: fix missing state reset on timeout
authorJoshua Crofts <joshua.crofts1@gmail.com>
Tue, 26 May 2026 11:15:29 +0000 (13:15 +0200)
committerJonathan Cameron <jic23@kernel.org>
Wed, 27 May 2026 11:11:15 +0000 (12:11 +0100)
Currently in the function opt3001_get_processed(), there is a check
that directly returns -ETIMEDOUT if the conversion IRQ times out,
completely bypassing the err label, leaving ok_to_ignore_lock
permanently true, potentially breaking the device's falling threshold
interrupt detection.

Assign -ETIMEDOUT to the return variable and jump to the error label
to ensure ok_to_ignore_lock is properly reset.

Fixes: 26d90b559057 ("iio: light: opt3001: Fixed timeout error when 0 lux")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/patchset/20260525-opt3001-cleanup-v4-0-65b36a174f78%40gmail.com?part=1
Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/light/opt3001.c

index 53bc455b7bad142695d9fecc6cabb934fb3ace0c..0d35d23da091ed6f3b4b955088b0ab1420262495 100644 (file)
@@ -366,8 +366,10 @@ static int opt3001_get_processed(struct opt3001 *opt, int *val, int *val2)
                ret = wait_event_timeout(opt->result_ready_queue,
                                opt->result_ready,
                                msecs_to_jiffies(OPT3001_RESULT_READY_LONG));
-               if (ret == 0)
-                       return -ETIMEDOUT;
+               if (ret == 0) {
+                       ret = -ETIMEDOUT;
+                       goto err;
+               }
        } else {
                /* Sleep for result ready time */
                timeout = (opt->int_time == OPT3001_INT_TIME_SHORT) ?