xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: light: opt3001: Fixed timeout error when 0 lux

Browse Source 
commit 26d90b5590579def54382a2fc34cfbe8518a9851 upstream.

Reading from sensor returned timeout error under
zero light conditions.

Signed-off-by: Jiri Valek - 2N <valek@2n.cz>
Fixes: ac663db367 ("iio: light: opt3001: enable operation w/o IRQ")
Link: https://lore.kernel.org/r/20210920125351.6569-1-valek@2n.cz
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Valek - 2N
2021-09-20 14:53:48 +02:00
committed by Greg Kroah-Hartman
parent e811506f60
commit 41e84a4f25
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iio/light/opt3001.c
View File

@@ -276,6 +276,8 @@ static int opt3001_get_lux(struct opt3001 *opt, int *val, int *val2)
ret = wait_event_timeout(opt->result_ready_queue, ret = wait_event_timeout(opt->result_ready_queue,
opt->result_ready, opt->result_ready,
msecs_to_jiffies(OPT3001_RESULT_READY_LONG)); msecs_to_jiffies(OPT3001_RESULT_READY_LONG));
if (ret == 0)
return -ETIMEDOUT;
} else { } else {
/* Sleep for result ready time */ /* Sleep for result ready time */
timeout = (opt->int_time == OPT3001_INT_TIME_SHORT) ? timeout = (opt->int_time == OPT3001_INT_TIME_SHORT) ?
@@ -312,9 +314,7 @@ err:
/* Disallow IRQ to access the device while lock is active */ /* Disallow IRQ to access the device while lock is active */
opt->ok_to_ignore_lock = false; opt->ok_to_ignore_lock = false;
if (ret == 0) if (ret < 0)
return -ETIMEDOUT;
else if (ret < 0)
return ret; return ret;
if (opt->use_irq) { if (opt->use_irq) {