aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2021-05-24 11:52:42 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-05-24 20:57:04 -0700
commitd9b576917a1d0efa293801a264150a1b37691617 (patch)
tree0ea44030ccded7a008e0f76fb08774cd7a9be3ee /drivers/input/keyboard
parentMAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT (diff)
downloadlinux-dev-d9b576917a1d0efa293801a264150a1b37691617.tar.xz
linux-dev-d9b576917a1d0efa293801a264150a1b37691617.zip
Input: hil_kbd - fix error return code in hil_dev_connect()
Return error code -EINVAL rather than '0' when the combo devices are not supported. Fixes: fa71c605c2bb ("Input: combine hil_kbd and hil_ptr drivers") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Link: https://lore.kernel.org/r/20210515030053.6824-1-thunder.leizhen@huawei.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/hil_kbd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index bb29a7c9a1c0..54afb38601b9 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -512,6 +512,7 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv)
HIL_IDD_NUM_AXES_PER_SET(*idd)) {
printk(KERN_INFO PREFIX
"combo devices are not supported.\n");
+ error = -EINVAL;
goto bail1;
}