xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: proximity: vl53l0x: Fix return value check of wait_for_completion_timeout

Browse Source 
[ 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: 3cef2e31b5 ("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>
This commit is contained in:
Miaoqian Lin
2022-04-12 06:42:09 +00:00
committed by Greg Kroah-Hartman
parent 43823ceb26
commit b30f2315a3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/iio/proximity/vl53l0x-i2c.c
View File

@@ -104,6 +104,7 @@ static int vl53l0x_read_proximity(struct vl53l0x_data *data,
u16 tries = 20; u16 tries = 20;
u8 buffer[12]; u8 buffer[12];
int ret; int ret;
unsigned long time_left;
ret = i2c_smbus_write_byte_data(client, VL_REG_SYSRANGE_START, 1); ret = i2c_smbus_write_byte_data(client, VL_REG_SYSRANGE_START, 1);
if (ret < 0) if (ret < 0)
@@ -112,10 +113,8 @@ static int vl53l0x_read_proximity(struct vl53l0x_data *data,
if (data->client->irq) { if (data->client->irq) {
reinit_completion(&data->completion); reinit_completion(&data->completion);
ret = wait_for_completion_timeout(&data->completion, HZ/10); time_left = wait_for_completion_timeout(&data->completion, HZ/10);
if (ret < 0) if (time_left == 0)
return ret;
else if (ret == 0)
return -ETIMEDOUT; return -ETIMEDOUT;
vl53l0x_clear_irq(data); vl53l0x_clear_irq(data);