RE: [PATCH] iio: proximity: Fix return value check of wait_for_completion_timeout

From: Sa, Nuno
Date: Tue Apr 12 2022 - 02:21:44 EST




> -----Original Message-----
> From: Miaoqian Lin <linmq006@xxxxxxxxx>
> Sent: Tuesday, April 12, 2022 5:00 AM
> To: Song Qiang <songqiang1304521@xxxxxxxxx>; Jonathan Cameron
> <jic23@xxxxxxxxxx>; Lars-Peter Clausen <lars@xxxxxxxxxx>; Ivan
> Drobyshevskyi <drobyshevskyi@xxxxxxxxx>; linux-
> iio@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Cc: linmq006@xxxxxxxxx
> Subject: [PATCH] iio: proximity: Fix return value check of
> wait_for_completion_timeout
>
> [External]
>
> 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@xxxxxxxxx>
> ---

Reviewed-by: Nuno Sá <nuno.sa@xxxxxxxxxx>

> 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 661a79ea200d..a284b20529fb 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.17.1