Re: [PATCH] iio: light: opt3001: Fixed timeout error when 0 lux
From: Jonathan Cameron <jic23@kernel.org>
Date: 2021-09-26 13:51:31
Also in:
lkml
On Mon, 20 Sep 2021 14:53:48 +0200 Jiri Valek - 2N [off-list ref] wrote:
Reading from sensor returned timeout error under zero light conditions. Signed-off-by: Jiri Valek - 2N <redacted>
Hi Jiri,
Thanks for this. Looks good to me though I'll leave a little longer for others
to take a look.
Does need a fixes tag though so we know how far to backport it.
I think it should be
Fixes: ac663db3678a ("iio: light: opt3001: enable operation w/o IRQ")
+Cc Alexander and Andreas
quoted hunk ↗ jump to hunk
--- drivers/iio/light/opt3001.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c index 52963da401a7..1880bd5bb258 100644 --- a/drivers/iio/light/opt3001.c +++ b/drivers/iio/light/opt3001.c@@ -276,6 +276,8 @@ static int opt3001_get_lux(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; } else { /* Sleep for result ready time */ timeout = (opt->int_time == OPT3001_INT_TIME_SHORT) ?@@ -312,9 +314,7 @@ static int opt3001_get_lux(struct opt3001 *opt, int *val, int *val2) /* Disallow IRQ to access the device while lock is active */ opt->ok_to_ignore_lock = false; - if (ret == 0) - return -ETIMEDOUT; - else if (ret < 0) + if (ret < 0) return ret; if (opt->use_irq) {