]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: hil_kbd - fix error return code in hil_dev_connect()
authorZhen Lei <thunder.leizhen@huawei.com>
Mon, 24 May 2021 18:52:42 +0000 (11:52 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:22:35 +0000 (16:22 +0200)
[ Upstream commit d9b576917a1d0efa293801a264150a1b37691617 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/input/keyboard/hil_kbd.c

index 5b152f25a8e1ff72e613608f08876b3098627469..da07742fd9a43b8c98f806e21b911c3b6772757d 100644 (file)
@@ -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;
                }