Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e185b64 authored by Jiri Valek - 2N's avatar Jiri Valek - 2N Committed by Greg Kroah-Hartman
Browse files

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: default avatarJiri Valek - 2N <valek@2n.cz>
Fixes: ac663db3 ("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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7bf8535b

drivers/iio/light/opt3001.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ 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) {