diff options
| author | Jiri Valek - 2N <valek@2n.cz> | 2021-09-20 15:53:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-20 12:23:03 +0300 |
| commit | 7e185b64585b8ef67f621cb59c8ee7796d024e47 (patch) | |
| tree | 3e5778ef7c131c02ede32e61dc843de63dc897c0 /drivers/iio | |
| parent | 7bf8535bc137a8baff7bafda5cd138672a98c3ea (diff) | |
| download | linux-7e185b64585b8ef67f621cb59c8ee7796d024e47.tar.xz | |
iio: light: opt3001: Fixed timeout error when 0 lux
commit 26d90b5590579def54382a2fc34cfbe8518a9851 upstream.
Reading from sensor returned timeout error under
zero light conditions.
Signed-off-by: Jiri Valek - 2N <valek@2n.cz>
Fixes: ac663db3678a ("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>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/light/opt3001.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c index f9d13e4ec108..162eff78c673 100644 --- a/drivers/iio/light/opt3001.c +++ b/drivers/iio/light/opt3001.c @@ -283,6 +283,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) ? @@ -319,9 +321,7 @@ err: /* 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) { |