lkml.org 
[lkml]   [2021]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 23/39] iio: light: opt3001: Fixed timeout error when 0 lux
    Date
    From: Jiri Valek - 2N <valek@2n.cz>

    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>
    ---
    drivers/iio/light/opt3001.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/iio/light/opt3001.c
    +++ b/drivers/iio/light/opt3001.c
    @@ -283,6 +283,8 @@ static int opt3001_get_lux(struct opt300
    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) {

    \
     
     \ /
      Last update: 2021-10-18 15:28    [W:2.250 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site