lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 029/247] iio: proximity: vl53l0x: Fix return value check of wait_for_completion_timeout
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 50f2959113cb6756ffd73c4fedc712cf2661f711 ]

    wait_for_completion_timeout() returns unsigned long not int.
    It returns 0 if timed out, and positive if completed.
    The check for <= 0 is ambiguous and should be == 0 here
    indicating timeout which is the only error case.

    Fixes: 3cef2e31b54b ("iio: proximity: vl53l0x: Add IRQ support")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20220412064210.10734-1-linmq006@gmail.com
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iio/proximity/vl53l0x-i2c.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/iio/proximity/vl53l0x-i2c.c b/drivers/iio/proximity/vl53l0x-i2c.c
    index cf38144b6f95..13a87d3e3544 100644
    --- a/drivers/iio/proximity/vl53l0x-i2c.c
    +++ b/drivers/iio/proximity/vl53l0x-i2c.c
    @@ -104,6 +104,7 @@ static int vl53l0x_read_proximity(struct vl53l0x_data *data,
    u16 tries = 20;
    u8 buffer[12];
    int ret;
    + unsigned long time_left;

    ret = i2c_smbus_write_byte_data(client, VL_REG_SYSRANGE_START, 1);
    if (ret < 0)
    @@ -112,10 +113,8 @@ static int vl53l0x_read_proximity(struct vl53l0x_data *data,
    if (data->client->irq) {
    reinit_completion(&data->completion);

    - ret = wait_for_completion_timeout(&data->completion, HZ/10);
    - if (ret < 0)
    - return ret;
    - else if (ret == 0)
    + time_left = wait_for_completion_timeout(&data->completion, HZ/10);
    + if (time_left == 0)
    return -ETIMEDOUT;

    vl53l0x_clear_irq(data);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 14:57    [W:3.108 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site