diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-29 02:10:54 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-29 02:10:54 +0100 |
| commit | 592b15ba7260f8dec8bfc71ef0ea1934801a35aa (patch) | |
| tree | 51ead1b83e10da0cf6623116f37a15bc142f9d8b /drivers/input/keyboard | |
| parent | Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G (diff) | |
| parent | Input: atmel_mxt_ts - don't try to free unallocated kernel memory (diff) | |
| download | linux-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.tar.xz linux-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.21 merge window.
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/nomadik-ske-keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c index 8567ee47761e..ae3b04557074 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; /* |