提交 8c8d1caa 编写于 作者: M Miaoqian Lin 提交者: Zheng Zengkai

iio: adc: stmpe-adc: Fix wait_for_completion_timeout return value check

stable inclusion
from stable-v5.10.122
commit 43823ceb26e6ea12ea1284a2e130f8a4ac886ff7
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=43823ceb26e6ea12ea1284a2e130f8a4ac886ff7

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

[ Upstream commit d345b232 ]

wait_for_completion_timeout() returns unsigned long not long.
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: e813dde6 ("iio: stmpe-adc: Use wait_for_completion_timeout")
Signed-off-by: NMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: NPhilippe Schenker <philippe.schenker@toradex.com>
Link: https://lore.kernel.org/r/20220412065150.14486-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>
上级 5ceb7b45
...@@ -61,7 +61,7 @@ struct stmpe_adc { ...@@ -61,7 +61,7 @@ struct stmpe_adc {
static int stmpe_read_voltage(struct stmpe_adc *info, static int stmpe_read_voltage(struct stmpe_adc *info,
struct iio_chan_spec const *chan, int *val) struct iio_chan_spec const *chan, int *val)
{ {
long ret; unsigned long ret;
mutex_lock(&info->lock); mutex_lock(&info->lock);
...@@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info, ...@@ -79,7 +79,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT); ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
if (ret <= 0) { if (ret == 0) {
stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA, stmpe_reg_write(info->stmpe, STMPE_REG_ADC_INT_STA,
STMPE_ADC_CH(info->channel)); STMPE_ADC_CH(info->channel));
mutex_unlock(&info->lock); mutex_unlock(&info->lock);
...@@ -96,7 +96,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info, ...@@ -96,7 +96,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
static int stmpe_read_temp(struct stmpe_adc *info, static int stmpe_read_temp(struct stmpe_adc *info,
struct iio_chan_spec const *chan, int *val) struct iio_chan_spec const *chan, int *val)
{ {
long ret; unsigned long ret;
mutex_lock(&info->lock); mutex_lock(&info->lock);
...@@ -114,7 +114,7 @@ static int stmpe_read_temp(struct stmpe_adc *info, ...@@ -114,7 +114,7 @@ static int stmpe_read_temp(struct stmpe_adc *info,
ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT); ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
if (ret <= 0) { if (ret == 0) {
mutex_unlock(&info->lock); mutex_unlock(&info->lock);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册