提交 9df3ddd7 编写于 作者: M Miaoqian Lin 提交者: Zheng Zengkai

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

stable inclusion
from stable-v5.10.122
commit b30f2315a3a611ed1d8c3e5e76b101daae5df67b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5W6OE

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b30f2315a3a611ed1d8c3e5e76b101daae5df67b

--------------------------------

[ Upstream commit 50f29591 ]

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: 3cef2e31 ("iio: proximity: vl53l0x: Add IRQ support")
Signed-off-by: NMiaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220412064210.10734-1-linmq006@gmail.comSigned-off-by: NJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 8c8d1caa
...@@ -104,6 +104,7 @@ static int vl53l0x_read_proximity(struct vl53l0x_data *data, ...@@ -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, ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册