| From 9b8f4017655d1f790a3907f4f8878902688458d0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 21 Dec 2018 00:38:30 -0800 |
| Subject: Input: nomadik-ske-keypad - fix a loop timeout test |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit 4d8f727b83bcd6702c2d210330872c9122d2d360 ] |
| |
| The loop exits with "timeout" set to -1 not to 0. |
| |
| Fixes: 1158f0f16224 ("Input: add support for Nomadik SKE keypad controller") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/keyboard/nomadik-ske-keypad.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c |
| index 8567ee47761e1..ae3b045570740 100644 |
| --- a/drivers/input/keyboard/nomadik-ske-keypad.c |
| +++ b/drivers/input/keyboard/nomadik-ske-keypad.c |
| @@ -100,7 +100,7 @@ static int __init ske_keypad_chip_init(struct ske_keypad *keypad) |
| while ((readl(keypad->reg_base + SKE_RIS) != 0x00000000) && timeout--) |
| cpu_relax(); |
| |
| - if (!timeout) |
| + if (timeout == -1) |
| return -EINVAL; |
| |
| /* |
| -- |
| 2.20.1 |
| |
